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 2021/03/29 06:28:32 UTC

[camel-kafka-connector] branch master updated (d128b9a -> d5a4d5f)

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

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


    from d128b9a  Updated CHANGELOG.md
     new c824ad7  Adjusted catalog tests for camel 3.9.0
     new 267ab14  Adjusted the code to CAMEL-16299
     new 970d92d  Upgrade Camel to 3.9.0
     new df8294c  Align to 3.9.0
     new cd32688  Align to 3.9.0
     new de9bacc  Align to 3.9.0
     new d660dd6  Align to 3.9.0
     new 4d9cfd3  Regen
     new d5a4d5f  Align to 3.9.0

The 9 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:
 .../camel-atmosphere-websocket-sink.json           |  21 -
 .../camel-atmosphere-websocket-source.json         |  28 +-
 ...nk.json => camel-aws-secrets-manager-sink.json} | 168 +++---
 .../resources/connectors/camel-aws2-cw-sink.json   |  26 +
 .../resources/connectors/camel-aws2-ddb-sink.json  |  26 +
 .../connectors/camel-aws2-ddbstream-source.json    |  26 +
 .../resources/connectors/camel-aws2-ec2-sink.json  |  26 +
 .../resources/connectors/camel-aws2-ecs-sink.json  |  26 +
 .../resources/connectors/camel-aws2-eks-sink.json  |  26 +
 .../connectors/camel-aws2-eventbridge-sink.json    |  26 +
 .../resources/connectors/camel-aws2-iam-sink.json  |  26 +
 .../resources/connectors/camel-aws2-kms-sink.json  |  26 +
 .../connectors/camel-aws2-lambda-sink.json         |  26 +
 .../resources/connectors/camel-aws2-mq-sink.json   |  26 +
 .../resources/connectors/camel-aws2-msk-sink.json  |  26 +
 .../resources/connectors/camel-aws2-s3-sink.json   |   4 +-
 .../resources/connectors/camel-aws2-s3-source.json |   4 +-
 .../resources/connectors/camel-aws2-ses-sink.json  |  26 +
 .../resources/connectors/camel-aws2-sns-sink.json  |  30 +-
 .../resources/connectors/camel-aws2-sqs-sink.json  |  44 +-
 .../connectors/camel-aws2-sqs-source.json          |  34 +-
 .../resources/connectors/camel-aws2-sts-sink.json  |  26 +
 .../connectors/camel-aws2-translate-sink.json      |  26 +
 .../resources/connectors/camel-file-sink.json      |   2 +-
 .../connectors/camel-freemarker-sink.json          |   7 +
 .../connectors/camel-google-bigquery-sql-sink.json |  12 +-
 ...-sink.json => camel-google-functions-sink.json} |  92 ++--
 .../camel-google-mail-stream-source.json           |   4 +-
 .../connectors/camel-google-pubsub-sink.json       |  16 +-
 .../connectors/camel-google-pubsub-source.json     |  16 +-
 .../connectors/camel-google-storage-sink.json      | 154 ++++++
 .../connectors/camel-google-storage-source.json    | 226 ++++----
 .../resources/connectors/camel-http-sink.json      | 114 +++-
 .../resources/connectors/camel-https-sink.json     | 114 +++-
 .../resources/connectors/camel-jetty-source.json   |  40 +-
 .../resources/connectors/camel-kafka-source.json   |  32 ++
 .../connectors/camel-netty-http-sink.json          |  14 +
 .../connectors/camel-netty-http-source.json        |  14 +
 .../resources/connectors/camel-netty-sink.json     |  14 +
 .../resources/connectors/camel-netty-source.json   |  14 +
 .../resources/connectors/camel-resteasy-sink.json  | 108 +++-
 .../connectors/camel-resteasy-source.json          |  89 ++-
 .../resources/connectors/camel-servlet-source.json |  28 +-
 .../resources/connectors/camel-slack-sink.json     |  12 +
 .../resources/connectors/camel-slack-source.json   |  38 +-
 .../resources/connectors/camel-smpp-sink.json      |   4 +-
 .../resources/connectors/camel-smpp-source.json    |   4 +-
 .../resources/connectors/camel-smpps-sink.json     |   4 +-
 .../resources/connectors/camel-smpps-source.json   |   4 +-
 .../resources/connectors/camel-splunk-sink.json    |   6 +
 .../connectors/camel-spring-rabbitmq-sink.json     |  14 +
 .../connectors/camel-spring-rabbitmq-source.json   | 107 ++++
 .../connectors/camel-vertx-http-sink.json          |  14 +
 .../connectors/camel-vertx-kafka-source.json       |  20 +
 .../resources/descriptors/connectors.properties    |  32 +-
 .../catalog/CamelKafkaConnectorCatalogTest.java    |   2 +-
 .../resources/camel-atmosphere-websocket-sink.json |  21 -
 .../camel-atmosphere-websocket-source.json         |  28 +-
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   4 +-
 ...amelAtmospherewebsocketSinkConnectorConfig.java |  12 -
 ...elAtmospherewebsocketSourceConnectorConfig.java |  16 +-
 .../descriptors/connector-sink.properties          |   1 -
 .../src/generated/resources/camel-aws-cw-sink.json | 202 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-cw-kafka-sink-connector.adoc    |  80 ---
 .../examples/CamelAwscwSinkConnector.properties    |  33 --
 .../awscw/CamelAwscwSinkConnectorConfig.java       | 158 ------
 .../kafkaconnector/awscw/CamelAwscwSinkTask.java   |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ddb-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ddb-sink.json    | 254 ---------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ddb-kafka-sink-connector.adoc   |  84 ---
 .../awsddb/CamelAwsddbSinkConnectorConfig.java     | 174 ------
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-ddbstream-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-source.properties        |   1 -
 .../src/main/assembly/package.xml                  |  56 --
 ...camel-aws-ddbstream-kafka-source-connector.adoc |  96 ----
 .../CamelAwsddbstreamSourceConnector.properties    |  33 --
 .../CamelAwsddbstreamSourceConnector.java          |  35 --
 .../CamelAwsddbstreamSourceConnectorConfig.java    | 225 --------
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ec2-sink.json    | 192 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ec2-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsec2SinkConnector.properties   |  37 --
 .../awsec2/CamelAwsec2SinkConnector.java           |  35 --
 .../awsec2/CamelAwsec2SinkConnectorConfig.java     | 134 -----
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ecs-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ecs-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ecs-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsecsSinkConnector.properties   |  37 --
 .../awsecs/CamelAwsecsSinkConnectorConfig.java     | 134 -----
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-eks-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-eks-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-eks-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwseksSinkConnector.properties   |  37 --
 .../awseks/CamelAwseksSinkConnector.java           |  35 --
 .../awseks/CamelAwseksSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awseks/CamelAwseksSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-iam-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-iam-sink.json    | 196 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-iam-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsiamSinkConnector.properties   |  37 --
 .../awsiam/CamelAwsiamSinkConnector.java           |  35 --
 .../awsiam/CamelAwsiamSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsiam/CamelAwsiamSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../pom.xml                                        | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../resources/camel-aws-kinesis-firehose-sink.json | 154 ------
 .../src/main/assembly/package.xml                  |  56 --
 ...-aws-kinesis-firehose-kafka-sink-connector.adoc |  72 ---
 ...CamelAwskinesisfirehoseSinkConnector.properties |  33 --
 .../CamelAwskinesisfirehoseSinkConnector.java      |  35 --
 ...CamelAwskinesisfirehoseSinkConnectorConfig.java | 129 -----
 .../CamelAwskinesisfirehoseSinkTask.java           |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-kinesis-kafka-connector/pom.xml      | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-aws-kinesis-sink.json          | 154 ------
 .../resources/camel-aws-kinesis-source.json        | 384 -------------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-kinesis-kafka-sink-connector.adoc    |  72 ---
 .../camel-aws-kinesis-kafka-source-connector.adoc  | 100 ----
 .../CamelAwskinesisSinkConnector.properties        |  33 --
 .../CamelAwskinesisSourceConnector.properties      |  33 --
 .../awskinesis/CamelAwskinesisSinkConnector.java   |  35 --
 .../CamelAwskinesisSinkConnectorConfig.java        | 128 -----
 .../awskinesis/CamelAwskinesisSinkTask.java        |  39 --
 .../CamelAwskinesisSourceConnectorConfig.java      | 240 ---------
 .../awskinesis/CamelAwskinesisSourceTask.java      |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-kms-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-kms-sink.json    | 182 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-kms-kafka-sink-connector.adoc   |  74 ---
 .../awskms/CamelAwskmsSinkConnector.java           |  35 --
 .../awskms/CamelAwskmsSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awskms/CamelAwskmsSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-lambda-sink.json | 208 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-lambda-kafka-sink-connector.adoc     |  74 ---
 .../CamelAwslambdaSinkConnector.properties         |  33 --
 .../awslambda/CamelAwslambdaSinkConnector.java     |  35 --
 .../CamelAwslambdaSinkConnectorConfig.java         | 136 -----
 .../awslambda/CamelAwslambdaSinkTask.java          |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-mq-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../src/generated/resources/camel-aws-mq-sink.json | 182 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-mq-kafka-sink-connector.adoc    |  74 ---
 .../examples/CamelAwsmqSinkConnector.properties    |  37 --
 .../awsmq/CamelAwsmqSinkConnector.java             |  35 --
 .../awsmq/CamelAwsmqSinkConnectorConfig.java       | 134 -----
 .../kafkaconnector/awsmq/CamelAwsmqSinkTask.java   |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-msk-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-msk-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-msk-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsmskSinkConnector.properties   |  37 --
 .../awsmsk/CamelAwsmskSinkConnector.java           |  35 --
 .../awsmsk/CamelAwsmskSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsmsk/CamelAwsmskSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-s3-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../src/generated/resources/camel-aws-s3-sink.json | 450 ----------------
 .../generated/resources/camel-aws-s3-source.json   | 566 -------------------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-s3-kafka-sink-connector.adoc    | 128 -----
 .../docs/camel-aws-s3-kafka-source-connector.adoc  | 168 ------
 .../awss3/CamelAwss3SinkConnector.java             |  35 --
 .../awss3/CamelAwss3SinkConnectorConfig.java       | 294 ----------
 .../kafkaconnector/awss3/CamelAwss3SinkTask.java   |  39 --
 .../awss3/CamelAwss3SourceConnector.java           |  35 --
 .../awss3/CamelAwss3SourceConnectorConfig.java     | 360 -------------
 .../kafkaconnector/awss3/CamelAwss3SourceTask.java |  39 --
 .../awss3/converters/S3ObjectConverter.java        |  45 --
 .../awss3/serializers/S3ObjectSerializer.java      |  59 --
 .../awss3/transformers/S3ObjectTransforms.java     |  55 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sdb-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-sdb-sink.json    | 118 ----
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sdb-kafka-sink-connector.adoc   |  65 ---
 .../examples/CamelAwssdbSinkConnector.properties   |  33 --
 .../awssdb/CamelAwssdbSinkConnector.java           |  35 --
 .../awssdb/CamelAwssdbSinkConnectorConfig.java     |  98 ----
 .../kafkaconnector/awssdb/CamelAwssdbSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-aws-secrets-manager-sink.json  | 168 +++---
 .../src/main/assembly/package.xml                  |   0
 ...l-aws-secrets-manager-kafka-sink-connector.adoc |  86 +++
 ...CamelAwssecretsmanagerSinkConnector.properties} |  10 +-
 .../CamelAwssecretsmanagerSinkConnector.java}      |   8 +-
 .../CamelAwssecretsmanagerSinkConnectorConfig.java | 169 ++++++
 .../CamelAwssecretsmanagerSinkTask.java}           |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 connectors/camel-aws-ses-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ses-sink.json    | 202 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ses-kafka-sink-connector.adoc   |  80 ---
 .../examples/CamelAwssesSinkConnector.properties   |  33 --
 .../awsses/CamelAwssesSinkConnector.java           |  35 --
 .../awsses/CamelAwssesSinkConnectorConfig.java     | 158 ------
 .../kafkaconnector/awsses/CamelAwssesSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sns-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-sns-sink.json    | 274 ----------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sns-kafka-sink-connector.adoc   |  91 ----
 .../examples/CamelAwssnsSinkConnector.properties   |  33 --
 .../awssns/CamelAwssnsSinkConnector.java           |  35 --
 .../awssns/CamelAwssnsSinkConnectorConfig.java     | 202 -------
 .../kafkaconnector/awssns/CamelAwssnsSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sqs-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-aws-sqs-sink.json    | 378 -------------
 .../generated/resources/camel-aws-sqs-source.json  | 600 ---------------------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sqs-kafka-sink-connector.adoc   | 103 ----
 .../docs/camel-aws-sqs-kafka-source-connector.adoc | 138 -----
 .../examples/CamelAwssqsSinkConnector.properties   |  33 --
 .../examples/CamelAwssqsSourceConnector.properties |  33 --
 .../awssqs/CamelAwssqsSinkConnector.java           |  35 --
 .../awssqs/CamelAwssqsSinkConnectorConfig.java     | 250 ---------
 .../kafkaconnector/awssqs/CamelAwssqsSinkTask.java |  39 --
 .../awssqs/CamelAwssqsSourceConnector.java         |  35 --
 .../awssqs/CamelAwssqsSourceConnectorConfig.java   | 392 --------------
 .../awssqs/CamelAwssqsSourceTask.java              |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-swf-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-aws-swf-sink.json    | 314 -----------
 .../generated/resources/camel-aws-swf-source.json  | 273 ----------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-swf-kafka-sink-connector.adoc   |  96 ----
 .../docs/camel-aws-swf-kafka-source-connector.adoc |  92 ----
 .../examples/CamelAwsswfSinkConnector.properties   |  33 --
 .../examples/CamelAwsswfSourceConnector.properties |  33 --
 .../awsswf/CamelAwsswfSinkConnector.java           |  35 --
 .../awsswf/CamelAwsswfSinkConnectorConfig.java     | 222 --------
 .../kafkaconnector/awsswf/CamelAwsswfSinkTask.java |  39 --
 .../awsswf/CamelAwsswfSourceConnector.java         |  35 --
 .../awsswf/CamelAwsswfSourceConnectorConfig.java   | 208 -------
 .../awsswf/CamelAwsswfSourceTask.java              |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-translate-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../resources/camel-aws-translate-sink.json        | 212 --------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-translate-kafka-sink-connector.adoc  |  80 ---
 .../CamelAwstranslateSinkConnector.properties      |  37 --
 .../CamelAwstranslateSinkConnector.java            |  35 --
 .../CamelAwstranslateSinkConnectorConfig.java      | 160 ------
 .../awstranslate/CamelAwstranslateSinkTask.java    |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../generated/resources/camel-aws2-cw-sink.json    |  26 +
 .../docs/camel-aws2-cw-kafka-sink-connector.adoc   |   6 +-
 .../aws2cw/CamelAws2cwSinkConnectorConfig.java     |  16 +
 .../generated/resources/camel-aws2-ddb-sink.json   |  26 +
 .../docs/camel-aws2-ddb-kafka-sink-connector.adoc  |   6 +-
 .../aws2ddb/CamelAws2ddbSinkConnectorConfig.java   |  16 +
 .../resources/camel-aws2-ddbstream-source.json     |  26 +
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   6 +-
 .../CamelAws2ddbstreamSourceConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-ec2-sink.json   |  26 +
 .../docs/camel-aws2-ec2-kafka-sink-connector.adoc  |   6 +-
 .../aws2ec2/CamelAws2ec2SinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-ecs-sink.json   |  26 +
 .../docs/camel-aws2-ecs-kafka-sink-connector.adoc  |   6 +-
 .../aws2ecs/CamelAws2ecsSinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-eks-sink.json   |  26 +
 .../docs/camel-aws2-eks-kafka-sink-connector.adoc  |   6 +-
 .../aws2eks/CamelAws2eksSinkConnectorConfig.java   |  16 +
 .../resources/camel-aws2-eventbridge-sink.json     |  26 +
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   6 +-
 .../CamelAws2eventbridgeSinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-iam-sink.json   |  26 +
 .../docs/camel-aws2-iam-kafka-sink-connector.adoc  |   6 +-
 .../aws2iam/CamelAws2iamSinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-kms-sink.json   |  26 +
 .../docs/camel-aws2-kms-kafka-sink-connector.adoc  |   6 +-
 .../aws2kms/CamelAws2kmsSinkConnectorConfig.java   |  16 +
 .../resources/camel-aws2-lambda-sink.json          |  26 +
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   6 +-
 .../CamelAws2lambdaSinkConnectorConfig.java        |  16 +
 .../generated/resources/camel-aws2-mq-sink.json    |  26 +
 .../docs/camel-aws2-mq-kafka-sink-connector.adoc   |   6 +-
 .../aws2mq/CamelAws2mqSinkConnectorConfig.java     |  16 +
 .../generated/resources/camel-aws2-msk-sink.json   |  26 +
 .../docs/camel-aws2-msk-kafka-sink-connector.adoc  |   6 +-
 .../aws2msk/CamelAws2mskSinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-s3-sink.json    |   4 +-
 .../generated/resources/camel-aws2-s3-source.json  |   4 +-
 .../docs/camel-aws2-s3-kafka-sink-connector.adoc   |   4 +-
 .../docs/camel-aws2-s3-kafka-source-connector.adoc |   4 +-
 .../aws2s3/CamelAws2s3SinkConnectorConfig.java     |   4 +-
 .../aws2s3/CamelAws2s3SourceConnectorConfig.java   |   4 +-
 .../generated/resources/camel-aws2-ses-sink.json   |  26 +
 .../docs/camel-aws2-ses-kafka-sink-connector.adoc  |   6 +-
 .../aws2ses/CamelAws2sesSinkConnectorConfig.java   |  16 +
 .../generated/resources/camel-aws2-sns-sink.json   |  30 +-
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |  10 +-
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   |  20 +-
 .../generated/resources/camel-aws2-sqs-sink.json   |  44 +-
 .../generated/resources/camel-aws2-sqs-source.json |  34 +-
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |  12 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  14 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |  28 +-
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |  24 +-
 .../generated/resources/camel-aws2-sts-sink.json   |  26 +
 .../docs/camel-aws2-sts-kafka-sink-connector.adoc  |   6 +-
 .../aws2sts/CamelAws2stsSinkConnectorConfig.java   |  16 +
 .../resources/camel-aws2-translate-sink.json       |  26 +
 .../camel-aws2-translate-kafka-sink-connector.adoc |   6 +-
 .../CamelAws2translateSinkConnectorConfig.java     |  16 +
 .../camel-azure-blob-kafka-connector/pom.xml       | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-azure-blob-sink.json | 320 -----------
 .../resources/camel-azure-blob-source.json         | 227 --------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-azure-blob-kafka-sink-connector.adoc     |  92 ----
 .../camel-azure-blob-kafka-source-connector.adoc   |  82 ---
 .../CamelAzureblobSinkConnector.properties         |  33 --
 .../CamelAzureblobSourceConnector.properties       |  33 --
 .../azureblob/CamelAzureblobSinkConnector.java     |  35 --
 .../CamelAzureblobSinkConnectorConfig.java         | 208 -------
 .../azureblob/CamelAzureblobSinkTask.java          |  39 --
 .../azureblob/CamelAzureblobSourceConnector.java   |  35 --
 .../CamelAzureblobSourceConnectorConfig.java       | 168 ------
 .../azureblob/CamelAzureblobSourceTask.java        |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-azure-queue-kafka-connector/pom.xml      | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-azure-queue-sink.json          | 178 ------
 .../resources/camel-azure-queue-source.json        | 125 -----
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-azure-queue-kafka-sink-connector.adoc    |  74 ---
 .../camel-azure-queue-kafka-source-connector.adoc  |  68 ---
 .../CamelAzurequeueSinkConnector.properties        |  33 --
 .../CamelAzurequeueSourceConnector.properties      |  33 --
 .../azurequeue/CamelAzurequeueSinkConnector.java   |  35 --
 .../CamelAzurequeueSinkConnectorConfig.java        | 136 -----
 .../azurequeue/CamelAzurequeueSinkTask.java        |  39 --
 .../azurequeue/CamelAzurequeueSourceConnector.java |  35 --
 .../CamelAzurequeueSourceConnectorConfig.java      | 112 ----
 .../azurequeue/CamelAzurequeueSourceTask.java      |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../src/generated/resources/camel-file-sink.json   |   2 +-
 .../main/docs/camel-file-kafka-sink-connector.adoc |   2 +-
 .../file/CamelFileSinkConnectorConfig.java         |   2 +-
 .../generated/resources/camel-freemarker-sink.json |   7 +
 .../camel-freemarker-kafka-sink-connector.adoc     |   3 +-
 .../CamelFreemarkerSinkConnectorConfig.java        |   4 +
 .../resources/camel-google-bigquery-sql-sink.json  |  12 +-
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   2 +-
 .../CamelGooglebigquerysqlSinkConnector.properties |   2 +-
 .../CamelGooglebigquerysqlSinkConnectorConfig.java |   8 +-
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-google-functions-sink.json     |  92 ++--
 .../src/main/assembly/package.xml                  |   0
 ...amel-google-functions-kafka-sink-connector.adoc |  65 +++
 .../CamelGooglefunctionsSinkConnector.properties}  |   8 +-
 .../CamelGooglefunctionsSinkConnector.java}        |   8 +-
 .../CamelGooglefunctionsSinkConnectorConfig.java   |  85 +++
 .../CamelGooglefunctionsSinkTask.java}             |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../resources/camel-google-mail-stream-source.json |   4 +-
 ...-google-mail-stream-kafka-source-connector.adoc |   4 +-
 ...CamelGooglemailstreamSourceConnectorConfig.java |   4 +-
 .../resources/camel-google-pubsub-sink.json        |  16 +-
 .../resources/camel-google-pubsub-source.json      |  16 +-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   8 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   8 +-
 .../CamelGooglepubsubSinkConnector.properties      |   8 +-
 .../CamelGooglepubsubSourceConnector.properties    |   8 +-
 .../CamelGooglepubsubSinkConnectorConfig.java      |  12 +-
 .../CamelGooglepubsubSourceConnectorConfig.java    |  12 +-
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../descriptors/connector-source.properties        |   1 +
 .../resources/camel-google-storage-sink.json       | 154 ++++++
 .../resources/camel-google-storage-source.json     | 232 ++++----
 .../src/main/assembly/package.xml                  |   0
 .../camel-google-storage-kafka-sink-connector.adoc |  74 +++
 ...mel-google-storage-kafka-source-connector.adoc} |  74 +--
 .../CamelGooglestorageSinkConnector.properties}    |   6 +-
 .../CamelGooglestorageSourceConnector.properties}  |   6 +-
 .../CamelGooglestorageSinkConnector.java}          |   8 +-
 .../CamelGooglestorageSinkConnectorConfig.java     | 121 +++++
 .../googlestorage/CamelGooglestorageSinkTask.java} |   8 +-
 .../CamelGooglestorageSourceConnector.java}        |   8 +-
 .../CamelGooglestorageSourceConnectorConfig.java   | 217 ++++++++
 .../CamelGooglestorageSourceTask.java}             |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../src/generated/resources/camel-http-sink.json   | 114 +++-
 .../main/docs/camel-http-kafka-sink-connector.adoc |  20 +-
 .../http/CamelHttpSinkConnectorConfig.java         |  66 ++-
 .../src/generated/resources/camel-https-sink.json  | 114 +++-
 .../docs/camel-https-kafka-sink-connector.adoc     |  20 +-
 .../https/CamelHttpsSinkConnectorConfig.java       |  66 ++-
 .../generated/resources/camel-jetty-source.json    |  40 +-
 .../docs/camel-jetty-kafka-source-connector.adoc   |   6 +-
 .../jetty/CamelJettySourceConnectorConfig.java     |  24 +-
 .../generated/resources/camel-kafka-source.json    |  32 ++
 .../docs/camel-kafka-kafka-source-connector.adoc   |   5 +-
 .../kafka/CamelKafkaSourceConnectorConfig.java     |  12 +
 .../generated/resources/camel-netty-http-sink.json |  14 +
 .../resources/camel-netty-http-source.json         |  14 +
 .../camel-netty-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   4 +-
 .../CamelNettyhttpSinkConnectorConfig.java         |   8 +
 .../CamelNettyhttpSourceConnectorConfig.java       |   8 +
 .../src/generated/resources/camel-netty-sink.json  |  14 +
 .../generated/resources/camel-netty-source.json    |  14 +
 .../docs/camel-netty-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-netty-kafka-source-connector.adoc   |   4 +-
 .../netty/CamelNettySinkConnectorConfig.java       |   8 +
 .../netty/CamelNettySourceConnectorConfig.java     |   8 +
 .../generated/resources/camel-resteasy-sink.json   | 108 +++-
 .../generated/resources/camel-resteasy-source.json |  89 ++-
 .../docs/camel-resteasy-kafka-sink-connector.adoc  |  20 +-
 .../camel-resteasy-kafka-source-connector.adoc     |  15 +-
 .../resteasy/CamelResteasySinkConnectorConfig.java |  66 ++-
 .../CamelResteasySourceConnectorConfig.java        |  52 +-
 .../generated/resources/camel-servlet-source.json  |  28 +-
 .../docs/camel-servlet-kafka-source-connector.adoc |   4 +-
 .../servlet/CamelServletSourceConnectorConfig.java |  16 +-
 .../src/generated/resources/camel-slack-sink.json  |  12 +
 .../generated/resources/camel-slack-source.json    |  38 +-
 .../docs/camel-slack-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-slack-kafka-source-connector.adoc   |   7 +-
 .../slack/CamelSlackSinkConnectorConfig.java       |   8 +
 .../slack/CamelSlackSourceConnectorConfig.java     |  20 +-
 .../src/generated/resources/camel-smpp-sink.json   |   4 +-
 .../src/generated/resources/camel-smpp-source.json |   4 +-
 .../main/docs/camel-smpp-kafka-sink-connector.adoc |   4 +-
 .../docs/camel-smpp-kafka-source-connector.adoc    |   4 +-
 .../smpp/CamelSmppSinkConnectorConfig.java         |   4 +-
 .../smpp/CamelSmppSourceConnectorConfig.java       |   4 +-
 .../src/generated/resources/camel-smpps-sink.json  |   4 +-
 .../generated/resources/camel-smpps-source.json    |   4 +-
 .../docs/camel-smpps-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-smpps-kafka-source-connector.adoc   |   4 +-
 .../smpps/CamelSmppsSinkConnectorConfig.java       |   4 +-
 .../smpps/CamelSmppsSourceConnectorConfig.java     |   4 +-
 .../src/generated/resources/camel-splunk-sink.json |   6 +
 .../docs/camel-splunk-kafka-sink-connector.adoc    |   3 +-
 .../splunk/CamelSplunkSinkConnectorConfig.java     |   4 +
 .../resources/camel-spring-rabbitmq-sink.json      |  14 +
 .../resources/camel-spring-rabbitmq-source.json    | 107 ++++
 ...camel-spring-rabbitmq-kafka-sink-connector.adoc |   4 +-
 ...mel-spring-rabbitmq-kafka-source-connector.adoc |  17 +-
 .../CamelSpringrabbitmqSinkConnectorConfig.java    |   8 +
 .../CamelSpringrabbitmqSourceConnectorConfig.java  |  60 +++
 .../generated/resources/camel-vertx-http-sink.json |  14 +
 .../camel-vertx-http-kafka-sink-connector.adoc     |   4 +-
 .../CamelVertxhttpSinkConnectorConfig.java         |   8 +
 .../resources/camel-vertx-kafka-source.json        |  20 +
 .../camel-vertx-kafka-kafka-source-connector.adoc  |   5 +-
 .../CamelVertxkafkaSourceConnectorConfig.java      |  12 +
 connectors/pom.xml                                 |  25 +-
 docs/modules/ROOT/nav.adoc                         |  57 +-
 docs/modules/ROOT/pages/connectors.adoc            |  27 +-
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   4 +-
 ...l-aws-secrets-manager-kafka-sink-connector.adoc |  86 +++
 .../camel-aws2-cw-kafka-sink-connector.adoc        |   6 +-
 .../camel-aws2-ddb-kafka-sink-connector.adoc       |   6 +-
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   6 +-
 .../camel-aws2-ec2-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-ecs-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-eks-kafka-sink-connector.adoc       |   6 +-
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   6 +-
 .../camel-aws2-iam-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-kms-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   6 +-
 .../camel-aws2-mq-kafka-sink-connector.adoc        |   6 +-
 .../camel-aws2-msk-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-s3-kafka-sink-connector.adoc        |   4 +-
 .../camel-aws2-s3-kafka-source-connector.adoc      |   4 +-
 .../camel-aws2-ses-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-sns-kafka-sink-connector.adoc       |  10 +-
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |  12 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  14 +-
 .../camel-aws2-sts-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-translate-kafka-sink-connector.adoc |   6 +-
 .../camel-file-kafka-sink-connector.adoc           |   2 +-
 .../camel-freemarker-kafka-sink-connector.adoc     |   3 +-
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   2 +-
 ...amel-google-functions-kafka-sink-connector.adoc |  65 +++
 ...-google-mail-stream-kafka-source-connector.adoc |   4 +-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   8 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   8 +-
 .../camel-google-storage-kafka-sink-connector.adoc |  74 +++
 ...amel-google-storage-kafka-source-connector.adoc |  74 +--
 .../camel-http-kafka-sink-connector.adoc           |  20 +-
 .../camel-https-kafka-sink-connector.adoc          |  20 +-
 .../camel-jetty-kafka-source-connector.adoc        |   6 +-
 .../camel-kafka-kafka-source-connector.adoc        |   5 +-
 .../camel-netty-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   4 +-
 .../camel-netty-kafka-sink-connector.adoc          |   4 +-
 .../camel-netty-kafka-source-connector.adoc        |   4 +-
 .../camel-resteasy-kafka-sink-connector.adoc       |  20 +-
 .../camel-resteasy-kafka-source-connector.adoc     |  15 +-
 .../camel-servlet-kafka-source-connector.adoc      |   4 +-
 .../camel-slack-kafka-sink-connector.adoc          |   4 +-
 .../camel-slack-kafka-source-connector.adoc        |   7 +-
 .../camel-smpp-kafka-sink-connector.adoc           |   4 +-
 .../camel-smpp-kafka-source-connector.adoc         |   4 +-
 .../camel-smpps-kafka-sink-connector.adoc          |   4 +-
 .../camel-smpps-kafka-source-connector.adoc        |   4 +-
 .../camel-splunk-kafka-sink-connector.adoc         |   3 +-
 ...camel-spring-rabbitmq-kafka-sink-connector.adoc |   4 +-
 ...mel-spring-rabbitmq-kafka-source-connector.adoc |  17 +-
 .../camel-vertx-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-vertx-kafka-kafka-source-connector.adoc  |   5 +-
 parent/pom.xml                                     |   2 +-
 pom.xml                                            |   2 +-
 tests/itests-aws-v1/pom.xml                        |  92 ----
 .../aws/v1/clients/AWSSQSClient.java               | 125 -----
 .../source/CamelAWSKinesisPropertyFactory.java     |  84 ---
 .../source/CamelSourceAWSKinesisITCase.java        | 260 ---------
 .../kinesis/source/TestKinesisConfiguration.java   |  39 --
 .../v1/s3/source/CamelAWSS3PropertyFactory.java    |  88 ---
 .../aws/v1/s3/source/CamelSourceAWSS3ITCase.java   | 230 --------
 .../aws/v1/s3/source/TestS3Configuration.java      |  39 --
 .../v1/sns/sink/CamelAWSSNSPropertyFactory.java    |  88 ---
 .../aws/v1/sns/sink/CamelSinkAWSSNSITCase.java     | 167 ------
 .../aws/v1/sns/sink/TestSNSConfiguration.java      |  36 --
 .../v1/sqs/sink/CamelAWSSQSPropertyFactory.java    | 103 ----
 .../aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java     | 179 ------
 .../v1/sqs/source/CamelAWSSQSPropertyFactory.java  |  98 ----
 .../aws/v1/sqs/source/CamelSourceAWSSQSITCase.java | 157 ------
 .../kafkaconnector/aws/v1/s3/source/file0.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file1.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file2.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file3.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file4.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file5.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file6.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file7.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file8.test     |  14 -
 .../kafkaconnector/aws/v1/s3/source/file9.test     |  14 -
 .../blob/sink/CamelSinkAzureStorageBlobITCase.java |   2 +-
 .../sink/CamelSinkAzureStorageQueueITCase.java     |   2 +-
 .../source/CamelSourceAzureStorageQueueITCase.java |   2 +-
 .../kafkaconnector/common/AbstractKafkaTest.java   |  15 +-
 .../common/services/kafka/KafkaServiceFactory.java |  45 --
 .../common/services/kafka/StrimziService.java      | 103 ----
 .../kafkaconnector/sjms2/common/SJMS2Common.java   |   9 +
 .../sjms2/sink/CamelSinkIdempotentJMSITCase.java   |   9 +-
 .../sjms2/sink/CamelSinkJMSITCase.java             |   9 +-
 .../sjms2/source/CamelSourceJMSITCase.java         |   9 +-
 .../source/CamelSourceJMSWithAggregation.java      |   9 +-
 tests/pom.xml                                      |   1 -
 616 files changed, 5734 insertions(+), 29333 deletions(-)
 copy camel-kafka-connector-catalog/src/generated/resources/connectors/{camel-aws2-translate-sink.json => camel-aws-secrets-manager-sink.json} (54%)
 copy camel-kafka-connector-catalog/src/generated/resources/connectors/{camel-slack-sink.json => camel-google-functions-sink.json} (51%)
 create mode 100644 camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
 rename connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json => camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json (58%)
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/docs/examples/CamelAwscwSinkConnector.properties
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkTask.java
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/examples/CamelAwsddbstreamSourceConnector.properties
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnector.java
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/docs/examples/CamelAwsec2SinkConnector.properties
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnector.java
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/docs/examples/CamelAwsecsSinkConnector.properties
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/docs/examples/CamelAwseksSinkConnector.properties
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnector.java
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkTask.java
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/docs/examples/CamelAwsiamSinkConnector.properties
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnector.java
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkTask.java
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehoseSinkConnector.properties
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnector.java
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkTask.java
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSinkConnector.properties
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSourceConnector.properties
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnector.java
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkTask.java
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceTask.java
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-kinesis-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnector.java
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkTask.java
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-kms-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/docs/examples/CamelAwslambdaSinkConnector.properties
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnector.java
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkTask.java
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-lambda-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/docs/examples/CamelAwsmqSinkConnector.properties
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnector.java
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkTask.java
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-mq-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/docs/examples/CamelAwsmskSinkConnector.properties
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnector.java
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkTask.java
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-msk-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnector.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkTask.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnector.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceTask.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/converters/S3ObjectConverter.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/serializers/S3ObjectSerializer.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/transformers/S3ObjectTransforms.java
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-s3-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/docs/examples/CamelAwssdbSinkConnector.properties
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnector.java
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkTask.java
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-sdb-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 rename connectors/{camel-aws-ec2-kafka-connector => camel-aws-secrets-manager-kafka-connector}/pom.xml (94%)
 create mode 100644 connectors/camel-aws-secrets-manager-kafka-connector/src/generated/descriptors/connector-sink.properties
 copy camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json => connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json (54%)
 copy connectors/{camel-zookeeper-master-kafka-connector => camel-aws-secrets-manager-kafka-connector}/src/main/assembly/package.xml (100%)
 create mode 100644 connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc
 rename connectors/{camel-aws-kms-kafka-connector/src/main/docs/examples/CamelAwskmsSinkConnector.properties => camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties} (74%)
 rename connectors/{camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnector.java => camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnector.java} (83%)
 create mode 100644 connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java
 rename connectors/{camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkTask.java => camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkTask.java} (86%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-aws-secrets-manager-kafka-connector}/src/main/resources/META-INF/LICENSE.txt (100%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-aws-secrets-manager-kafka-connector}/src/main/resources/META-INF/NOTICE.txt (100%)
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/docs/examples/CamelAwssesSinkConnector.properties
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnector.java
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkTask.java
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-ses-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/docs/examples/CamelAwssnsSinkConnector.properties
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnector.java
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkTask.java
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-sns-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/docs/examples/CamelAwssqsSinkConnector.properties
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/docs/examples/CamelAwssqsSourceConnector.properties
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnector.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkTask.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnector.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceTask.java
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-sqs-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/docs/examples/CamelAwsswfSinkConnector.properties
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/docs/examples/CamelAwsswfSourceConnector.properties
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnector.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkTask.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnector.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceTask.java
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-swf-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/docs/examples/CamelAwstranslateSinkConnector.properties
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnector.java
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkTask.java
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-aws-translate-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-sink.json
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-source.json
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/docs/camel-azure-blob-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/docs/camel-azure-blob-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/docs/examples/CamelAzureblobSinkConnector.properties
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/docs/examples/CamelAzureblobSourceConnector.properties
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSinkConnector.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSinkConnectorConfig.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSinkTask.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSourceConnector.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSourceConnectorConfig.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureblob/CamelAzureblobSourceTask.java
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-azure-blob-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/pom.xml
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/generated/descriptors/connector-sink.properties
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/generated/descriptors/connector-source.properties
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-sink.json
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-source.json
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/assembly/package.xml
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/docs/camel-azure-queue-kafka-sink-connector.adoc
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/docs/camel-azure-queue-kafka-source-connector.adoc
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/docs/examples/CamelAzurequeueSinkConnector.properties
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/docs/examples/CamelAzurequeueSourceConnector.properties
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSinkConnector.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSinkConnectorConfig.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSinkTask.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSourceConnector.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSourceConnectorConfig.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurequeue/CamelAzurequeueSourceTask.java
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 connectors/camel-azure-queue-kafka-connector/src/main/resources/META-INF/NOTICE.txt
 rename connectors/{camel-aws-lambda-kafka-connector => camel-google-functions-kafka-connector}/pom.xml (94%)
 create mode 100644 connectors/camel-google-functions-kafka-connector/src/generated/descriptors/connector-sink.properties
 copy camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json => connectors/camel-google-functions-kafka-connector/src/generated/resources/camel-google-functions-sink.json (51%)
 copy connectors/{camel-zookeeper-master-kafka-connector => camel-google-functions-kafka-connector}/src/main/assembly/package.xml (100%)
 create mode 100644 connectors/camel-google-functions-kafka-connector/src/main/docs/camel-google-functions-kafka-sink-connector.adoc
 rename connectors/{camel-aws-ddb-kafka-connector/src/main/docs/examples/CamelAwsddbSinkConnector.properties => camel-google-functions-kafka-connector/src/main/docs/examples/CamelGooglefunctionsSinkConnector.properties} (86%)
 rename connectors/{camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnector.java => camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnector.java} (83%)
 create mode 100644 connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnectorConfig.java
 rename connectors/{camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkTask.java => camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkTask.java} (87%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-google-functions-kafka-connector}/src/main/resources/META-INF/LICENSE.txt (100%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-google-functions-kafka-connector}/src/main/resources/META-INF/NOTICE.txt (100%)
 rename connectors/{camel-aws-cw-kafka-connector => camel-google-storage-kafka-connector}/pom.xml (94%)
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-sink.properties
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-source.properties
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
 copy camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json => connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json (58%)
 copy connectors/{camel-zookeeper-master-kafka-connector => camel-google-storage-kafka-connector}/src/main/assembly/package.xml (100%)
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
 copy connectors/{camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc => camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc} (52%)
 rename connectors/{camel-aws-s3-kafka-connector/src/main/docs/examples/CamelAwss3SinkConnector.properties => camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSinkConnector.properties} (89%)
 rename connectors/{camel-aws-s3-kafka-connector/src/main/docs/examples/CamelAwss3SourceConnector.properties => camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSourceConnector.properties} (89%)
 rename connectors/{camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnector.java => camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnector.java} (84%)
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
 rename connectors/{camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkTask.java => camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkTask.java} (87%)
 rename connectors/{camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnector.java => camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnector.java} (83%)
 create mode 100644 connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
 rename connectors/{camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceTask.java => camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceTask.java} (87%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-google-storage-kafka-connector}/src/main/resources/META-INF/LICENSE.txt (100%)
 copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-google-storage-kafka-connector}/src/main/resources/META-INF/NOTICE.txt (100%)
 create mode 100644 docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc
 create mode 100644 docs/modules/ROOT/pages/connectors/camel-google-functions-kafka-sink-connector.adoc
 create mode 100644 docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
 copy connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc => docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc (52%)
 delete mode 100644 tests/itests-aws-v1/pom.xml
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSSQSClient.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelAWSKinesisPropertyFactory.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/TestKinesisConfiguration.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelAWSS3PropertyFactory.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/TestS3Configuration.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelAWSSNSPropertyFactory.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/TestSNSConfiguration.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelAWSSQSPropertyFactory.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelAWSSQSPropertyFactory.java
 delete mode 100644 tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file0.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file1.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file2.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file3.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file4.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file5.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file6.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file7.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file8.test
 delete mode 100644 tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file9.test
 delete mode 100644 tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/KafkaServiceFactory.java
 delete mode 100644 tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/StrimziService.java

[camel-kafka-connector] 05/09: Align to 3.9.0

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

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

commit cd32688e94af7267866eda5011cf362dbd9fa3fa
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:35:45 2021 +0200

    Align to 3.9.0
---
 connectors/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/connectors/pom.xml b/connectors/pom.xml
index 332874b..52c980c 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -234,9 +234,7 @@
         <module>camel-aws2-sqs-kafka-connector</module>
         <module>camel-aws2-sts-kafka-connector</module>
         <module>camel-aws2-translate-kafka-connector</module>
-        <module>camel-azure-blob-kafka-connector</module>
         <module>camel-azure-eventhubs-kafka-connector</module>
-        <module>camel-azure-queue-kafka-connector</module>
         <module>camel-azure-storage-blob-kafka-connector</module>
         <module>camel-azure-storage-datalake-kafka-connector</module>
         <module>camel-azure-storage-queue-kafka-connector</module>

[camel-kafka-connector] 03/09: Upgrade Camel to 3.9.0

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

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

commit 970d92d84c13aa80cb6d649f59c40d620f11673e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:31:43 2021 +0200

    Upgrade Camel to 3.9.0
---
 parent/pom.xml | 2 +-
 pom.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 067edda..393f24b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <kafka.version>2.7.0</kafka.version>
-        <camel.version>3.8.0</camel.version>
+        <camel.version>3.9.0</camel.version>
         <apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
         <resteasy.version>4.5.6.Final</resteasy.version>
         <version.java>1.8</version.java>
diff --git a/pom.xml b/pom.xml
index b8e7d5f..633b9a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.8.0</version>
+        <version>3.9.0</version>
     </parent>
 
     <groupId>org.apache.camel.kafkaconnector</groupId>

[camel-kafka-connector] 06/09: Align to 3.9.0

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

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

commit de9baccbaf5e04d657745949a7cb6641184ac19c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:36:38 2021 +0200

    Align to 3.9.0
---
 tests/itests-aws-v1/pom.xml                        |  92 --------
 .../aws/v1/clients/AWSSQSClient.java               | 125 ----------
 .../source/CamelAWSKinesisPropertyFactory.java     |  84 -------
 .../source/CamelSourceAWSKinesisITCase.java        | 260 ---------------------
 .../kinesis/source/TestKinesisConfiguration.java   |  39 ----
 .../v1/s3/source/CamelAWSS3PropertyFactory.java    |  88 -------
 .../aws/v1/s3/source/CamelSourceAWSS3ITCase.java   | 230 ------------------
 .../aws/v1/s3/source/TestS3Configuration.java      |  39 ----
 .../v1/sns/sink/CamelAWSSNSPropertyFactory.java    |  88 -------
 .../aws/v1/sns/sink/CamelSinkAWSSNSITCase.java     | 167 -------------
 .../aws/v1/sns/sink/TestSNSConfiguration.java      |  36 ---
 .../v1/sqs/sink/CamelAWSSQSPropertyFactory.java    | 103 --------
 .../aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java     | 179 --------------
 .../v1/sqs/source/CamelAWSSQSPropertyFactory.java  |  98 --------
 .../aws/v1/sqs/source/CamelSourceAWSSQSITCase.java | 157 -------------
 .../kafkaconnector/aws/v1/s3/source/file0.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file1.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file2.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file3.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file4.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file5.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file6.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file7.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file8.test     |  14 --
 .../kafkaconnector/aws/v1/s3/source/file9.test     |  14 --
 tests/pom.xml                                      |   1 -
 26 files changed, 1926 deletions(-)

diff --git a/tests/itests-aws-v1/pom.xml b/tests/itests-aws-v1/pom.xml
deleted file mode 100644
index 1db9aff..0000000
--- a/tests/itests-aws-v1/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.apache.camel.kafkaconnector</groupId>
-        <artifactId>itests-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../itests-parent/pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itests-aws-v1</artifactId>
-    <name>Camel-Kafka-Connector :: Tests :: AWS v1</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel.kafkaconnector</groupId>
-            <artifactId>itests-common</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-common</artifactId>
-            <version>${camel.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v1</artifactId>
-            <version>${camel.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-aws-sqs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-aws-s3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-aws-sns</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-aws-kinesis</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <!-- Properties needed for the test:
-                    - com.amazonaws.sdk.disableCbor is used to ensure the AWS Kinesis reply is parseable
-                     -->
-                    <argLine>${common.failsafe.args} -Dcom.amazonaws.sdk.disableCbor=true</argLine>
-                    <skipTests>${skipIntegrationTests}</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSSQSClient.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSSQSClient.java
deleted file mode 100644
index 10a16cd..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSSQSClient.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.clients;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.CreateQueueRequest;
-import com.amazonaws.services.sqs.model.DeleteQueueResult;
-import com.amazonaws.services.sqs.model.GetQueueUrlResult;
-import com.amazonaws.services.sqs.model.Message;
-import com.amazonaws.services.sqs.model.QueueDoesNotExistException;
-import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
-import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-import com.amazonaws.services.sqs.model.SendMessageRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AWSSQSClient {
-    private static final Logger LOG = LoggerFactory.getLogger(AWSSQSClient.class);
-
-    private final AmazonSQS sqs;
-    private int maxWaitTime = 10;
-    private int maxNumberOfMessages = 1;
-
-    public AWSSQSClient(AmazonSQS sqs) {
-        this.sqs = sqs;
-    }
-
-    public String createQueue(String queue) {
-        final Map<String, String> queueAttributes = new HashMap<>();
-
-        final CreateQueueRequest createFifoQueueRequest = new CreateQueueRequest(queue).withAttributes(queueAttributes);
-
-        return sqs.createQueue(createFifoQueueRequest).getQueueUrl();
-    }
-
-    public synchronized String getQueue(String queue) {
-        try {
-            GetQueueUrlResult getQueueUrlResult = sqs.getQueueUrl(queue);
-
-            return getQueueUrlResult.getQueueUrl();
-        } catch (QueueDoesNotExistException e) {
-            return createQueue(queue);
-        }
-    }
-
-    public void receive(String queue, Predicate<List<Message>> predicate) {
-        final String queueUrl = getQueue(queue);
-
-        receiveFrom(queueUrl, predicate);
-    }
-
-    public void receiveFrom(String queueUrl, Predicate<List<Message>> predicate) {
-        LOG.debug("Consuming messages from {}", queueUrl);
-
-        final ReceiveMessageRequest request = new ReceiveMessageRequest(queueUrl).withWaitTimeSeconds(maxWaitTime)
-                .withMaxNumberOfMessages(maxNumberOfMessages);
-
-        while (true) {
-            ReceiveMessageResult result = sqs.receiveMessage(request);
-
-            List<Message> messages = result.getMessages();
-
-            if (!predicate.test(messages)) {
-                return;
-            }
-        }
-    }
-
-    public void send(String queue, String body) {
-        final String queueUrl = getQueue(queue);
-
-        sendTo(queueUrl, body);
-    }
-
-    public void sendTo(String queueUrl, String body) {
-        LOG.debug("Sending messages to {}", queueUrl);
-
-        SendMessageRequest request = new SendMessageRequest().withQueueUrl(queueUrl).withMessageBody(body);
-
-        sqs.sendMessage(request);
-    }
-
-    public boolean deleteQueue(String queue) {
-        GetQueueUrlResult getQueueUrlResult = sqs.getQueueUrl(queue);
-
-        if (getQueueUrlResult.getSdkHttpMetadata().getHttpStatusCode() == 404) {
-            return true;
-        } else {
-            if (getQueueUrlResult.getSdkHttpMetadata().getHttpStatusCode() != 200) {
-                LOG.warn("Unable to get queue {} for deletion", queue);
-
-                return false;
-            }
-        }
-
-        DeleteQueueResult result = sqs.deleteQueue(getQueueUrlResult.getQueueUrl());
-
-        if (result.getSdkHttpMetadata().getHttpStatusCode() != 200) {
-            LOG.warn("Unable to delete queue {}", queue);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelAWSKinesisPropertyFactory.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelAWSKinesisPropertyFactory.java
deleted file mode 100644
index 014c706..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelAWSKinesisPropertyFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.kinesis.source;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.common.EndpointUrlBuilder;
-import org.apache.camel.kafkaconnector.common.SourceConnectorPropertyFactory;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-
-/**
- * Creates the set of properties used by a Camel Kinesis Source Connector
- */
-final class CamelAWSKinesisPropertyFactory extends SourceConnectorPropertyFactory<CamelAWSKinesisPropertyFactory> {
-    public static final Map<String, String> SPRING_STYLE = new HashMap<>();
-    public static final Map<String, String> KAFKA_STYLE = new HashMap<>();
-
-    static {
-        SPRING_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-kinesis.accessKey");
-        SPRING_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-kinesis.secretKey");
-        SPRING_STYLE.put(AWSConfigs.REGION, "camel.component.aws-kinesis.region");
-
-        KAFKA_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-kinesis.access-key");
-        KAFKA_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-kinesis.secret-key");
-        KAFKA_STYLE.put(AWSConfigs.REGION, "camel.component.aws-kinesis.region");
-    }
-
-    private CamelAWSKinesisPropertyFactory() {
-
-    }
-
-    public CamelAWSKinesisPropertyFactory withAmazonConfig(Properties amazonConfigs) {
-        return withAmazonConfig(amazonConfigs, this.SPRING_STYLE);
-    }
-
-    public CamelAWSKinesisPropertyFactory withAmazonConfig(Properties amazonConfigs, Map<String, String> style) {
-        String accessKeyKey = style.get(AWSConfigs.ACCESS_KEY);
-        String secretKeyKey = style.get(AWSConfigs.SECRET_KEY);
-        String regionKey = style.get(AWSConfigs.REGION);
-
-        setProperty(accessKeyKey, amazonConfigs.getProperty(AWSConfigs.ACCESS_KEY, ""));
-        setProperty(secretKeyKey, amazonConfigs.getProperty(AWSConfigs.SECRET_KEY, ""));
-        return setProperty(regionKey, amazonConfigs.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()));
-    }
-
-    public CamelAWSKinesisPropertyFactory withStreamName(String streamName) {
-        return setProperty("camel.source.path.streamName", streamName);
-    }
-
-    public EndpointUrlBuilder<CamelAWSKinesisPropertyFactory> withUrl(String streamName) {
-        String sourceUrl = String.format("aws-kinesis://%s", streamName);
-
-        return new EndpointUrlBuilder<>(this::withSourceUrl, sourceUrl);
-    }
-
-    public CamelAWSKinesisPropertyFactory withConfiguration(String configurationClass) {
-        return setProperty("camel.component.aws-kinesis.configuration", classRef(configurationClass));
-    }
-
-    public static CamelAWSKinesisPropertyFactory basic() {
-        return new CamelAWSKinesisPropertyFactory().withName("CamelAwskinesisSourceConnector").withTasksMax(1)
-                .withConnectorClass("org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSourceConnector")
-                .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
-                .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
deleted file mode 100644
index da6ab70..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.kinesis.source;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.kinesis.model.CreateStreamResult;
-import com.amazonaws.services.kinesis.model.DeleteStreamResult;
-import com.amazonaws.services.kinesis.model.DescribeStreamResult;
-import com.amazonaws.services.kinesis.model.PutRecordsRequest;
-import com.amazonaws.services.kinesis.model.PutRecordsRequestEntry;
-import com.amazonaws.services.kinesis.model.PutRecordsResult;
-import com.amazonaws.services.kinesis.model.ResourceInUseException;
-import com.amazonaws.services.kinesis.model.ResourceNotFoundException;
-import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
-import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-import org.apache.camel.test.infra.aws.common.AWSCommon;
-import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
-public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
-
-    @RegisterExtension
-    public static AWSService service = AWSServiceFactory.createKinesisService();
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSKinesisITCase.class);
-
-    private String streamName;
-    private AmazonKinesis awsKinesisClient;
-    private volatile int received;
-    private final int expect = 10;
-
-    @Override
-    protected String[] getConnectorsInTest() {
-        return new String[] {"camel-aws-kinesis-kafka-connector"};
-    }
-
-    private void doCreateStream() {
-        CreateStreamResult result = awsKinesisClient.createStream(streamName, 1);
-        if (result.getSdkHttpMetadata().getHttpStatusCode() != 200) {
-            fail("Failed to create the stream");
-        } else {
-            LOG.info("Stream created successfully");
-        }
-    }
-
-    private void createStream() {
-        try {
-            LOG.info("Checking whether the stream exists already");
-            DescribeStreamResult describeStreamResult = awsKinesisClient.describeStream(streamName);
-
-            int status = describeStreamResult.getSdkHttpMetadata().getHttpStatusCode();
-            LOG.info("Kinesis stream check result: {}", status);
-        } catch (ResourceNotFoundException e) {
-            LOG.info("The stream does not exist, auto creating it ...");
-            doCreateStream();
-        }
-    }
-
-    private void doDeleteStream() {
-        DeleteStreamResult result = awsKinesisClient.deleteStream(streamName);
-
-        if (result.getSdkHttpMetadata().getHttpStatusCode() != 200) {
-            fail("Failed to delete the stream");
-        } else {
-            LOG.info("Stream deleted successfully");
-        }
-    }
-
-    private void deleteStream() {
-        try {
-            LOG.info("Checking whether the stream exists already");
-            DescribeStreamResult describeStreamResult = awsKinesisClient.describeStream(streamName);
-
-            int status = describeStreamResult.getSdkHttpMetadata().getHttpStatusCode();
-            LOG.info("Kinesis stream check result: {}", status);
-            doDeleteStream();
-        } catch (ResourceNotFoundException e) {
-            LOG.info("The stream does not exist, skipping deletion");
-        } catch (ResourceInUseException e) {
-            LOG.info("The stream exist but cannot be deleted because it's in use");
-            doDeleteStream();
-        }
-    }
-
-    @BeforeEach
-    public void setUp() {
-        streamName = AWSCommon.KINESIS_STREAM_BASE_NAME + "-" + TestUtils.randomWithRange(0, 100);
-
-        awsKinesisClient = AWSClientUtils.newKinesisClient();
-        received = 0;
-
-        createStream();
-    }
-
-    @AfterEach
-    public void tearDown() {
-        deleteStream();
-
-        awsKinesisClient.shutdown();
-    }
-
-    private boolean checkRecord(ConsumerRecord<String, String> record) {
-        LOG.debug("Received: {}", record.value());
-        received++;
-
-        if (received == expect) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public void runtTest(ConnectorPropertyFactory connectorPropertyFactory)
-            throws ExecutionException, InterruptedException {
-        connectorPropertyFactory.log();
-        getKafkaConnectService().initializeConnector(connectorPropertyFactory);
-
-        putRecords();
-        LOG.debug("Initialized the connector and put the data for the test execution");
-
-        LOG.debug("Creating the consumer ...");
-        KafkaClient<String, String> kafkaClient = new KafkaClient<>(getKafkaService().getBootstrapServers());
-        kafkaClient.consume(TestUtils.getDefaultTestTopic(this.getClass()), this::checkRecord);
-        LOG.debug("Created the consumer ...");
-
-        assertEquals(received, expect, "Didn't process the expected amount of messages");
-    }
-
-    @Test
-    @Timeout(120)
-    public void testBasicSendReceive() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSKinesisPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withAmazonConfig(service.getConnectionProperties())
-                .withConfiguration(TestKinesisConfiguration.class.getName()).withStreamName(streamName);
-
-        runtTest(connectorPropertyFactory);
-    }
-
-    @Test
-    @Timeout(120)
-    public void testBasicSendReceiveWithKafkaStyle() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSKinesisPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withAmazonConfig(service.getConnectionProperties(), CamelAWSKinesisPropertyFactory.KAFKA_STYLE)
-                .withConfiguration(TestKinesisConfiguration.class.getName()).withStreamName(streamName);
-
-        runtTest(connectorPropertyFactory);
-    }
-
-    @Test
-    @Timeout(120)
-    public void testBasicSendReceiveUsingUrl() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSKinesisPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withAmazonConfig(service.getConnectionProperties())
-                .withConfiguration(TestKinesisConfiguration.class.getName()).withUrl(streamName).buildUrl();
-
-        runtTest(connectorPropertyFactory);
-    }
-
-    private void putRecords() {
-        PutRecordsRequest putRecordsRequest = new PutRecordsRequest();
-        putRecordsRequest.setStreamName(streamName);
-
-        List<PutRecordsRequestEntry> putRecordsRequestEntryList = new ArrayList<>();
-
-        LOG.debug("Adding data to the Kinesis stream");
-        for (int i = 0; i < expect; i++) {
-            PutRecordsRequestEntry putRecordsRequestEntry = new PutRecordsRequestEntry();
-            putRecordsRequestEntry.setData(ByteBuffer.wrap(String.valueOf(i).getBytes()));
-
-            String partition = String.format("partitionKey-%d", i);
-            putRecordsRequestEntry.setPartitionKey(partition);
-
-            LOG.debug("Added data {} (as bytes) to partition {}", i, partition);
-
-            putRecordsRequestEntryList.add(putRecordsRequestEntry);
-        }
-
-        LOG.debug("Done creating the data records");
-
-        int retries = 5;
-        do {
-            try {
-                putRecordsRequest.setRecords(putRecordsRequestEntryList);
-                PutRecordsResult putRecordsResult = awsKinesisClient.putRecords(putRecordsRequest);
-
-                if (putRecordsResult.getFailedRecordCount() == 0) {
-                    LOG.debug("Done putting the data records into the stream");
-                } else {
-                    fail("Unable to put all the records into the stream");
-                }
-
-                break;
-            } catch (AmazonServiceException e) {
-                retries--;
-
-                /*
-                 * This works around the "... Cannot deserialize instance of `...AmazonKinesisException` out of
-                 * NOT_AVAILABLE token
-                 * 
-                 * It may take some time for the local Kinesis backend to be fully up - even though the container is
-                 * reportedly up and running. Therefore, it tries a few more times
-                 */
-                LOG.trace("Failed to put the records: {}. Retrying in 2 seconds ...", e.getMessage());
-                if (retries == 0) {
-                    LOG.error("Failed to put the records: {}", e.getMessage(), e);
-                    throw e;
-                }
-
-                try {
-                    Thread.sleep(TimeUnit.SECONDS.toMillis(2));
-                } catch (InterruptedException ex) {
-                    break;
-                }
-            }
-        } while (retries > 0);
-
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/TestKinesisConfiguration.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/TestKinesisConfiguration.java
deleted file mode 100644
index 6d84f4c..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/TestKinesisConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.kinesis.source;
-
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import org.apache.camel.component.aws.kinesis.KinesisConfiguration;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-
-public class TestKinesisConfiguration extends KinesisConfiguration {
-    private AmazonKinesis amazonKinesis;
-
-    private AmazonKinesis buildClient() {
-        return AWSClientUtils.newKinesisClient();
-    }
-
-    @Override
-    public AmazonKinesis getAmazonKinesisClient() {
-        if (amazonKinesis == null) {
-            amazonKinesis = buildClient();
-        }
-
-        return amazonKinesis;
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelAWSS3PropertyFactory.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelAWSS3PropertyFactory.java
deleted file mode 100644
index e45cffe..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelAWSS3PropertyFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.s3.source;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.common.EndpointUrlBuilder;
-import org.apache.camel.kafkaconnector.common.SourceConnectorPropertyFactory;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-
-/**
- * Creates the set of properties used by a Camel JMS Sink Connector
- */
-final class CamelAWSS3PropertyFactory extends SourceConnectorPropertyFactory<CamelAWSS3PropertyFactory> {
-    public static final Map<String, String> SPRING_STYLE = new HashMap<>();
-    public static final Map<String, String> KAFKA_STYLE = new HashMap<>();
-
-    static {
-        SPRING_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-s3.accessKey");
-        SPRING_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-s3.secretKey");
-        SPRING_STYLE.put(AWSConfigs.REGION, "camel.component.aws-s3.region");
-
-        KAFKA_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-s3.access-key");
-        KAFKA_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-s3.secret-key");
-        KAFKA_STYLE.put(AWSConfigs.REGION, "camel.component.aws-s3.region");
-    }
-
-    private CamelAWSS3PropertyFactory() {
-
-    }
-
-    public CamelAWSS3PropertyFactory withAmazonConfig(Properties amazonConfigs) {
-        return withAmazonConfig(amazonConfigs, this.SPRING_STYLE);
-    }
-
-    public CamelAWSS3PropertyFactory withAmazonConfig(Properties amazonConfigs, Map<String, String> style) {
-        String accessKeyKey = style.get(AWSConfigs.ACCESS_KEY);
-        String secretKeyKey = style.get(AWSConfigs.SECRET_KEY);
-        String regionKey = style.get(AWSConfigs.REGION);
-
-        setProperty(accessKeyKey, amazonConfigs.getProperty(AWSConfigs.ACCESS_KEY, ""));
-        setProperty(secretKeyKey, amazonConfigs.getProperty(AWSConfigs.SECRET_KEY, ""));
-        return setProperty(regionKey, amazonConfigs.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()));
-    }
-
-    public EndpointUrlBuilder<CamelAWSS3PropertyFactory> withUrl(String bucket) {
-        String queueUrl = String.format("aws-s3://%s", bucket);
-
-        return new EndpointUrlBuilder<>(this::withSourceUrl, queueUrl);
-    }
-
-    public CamelAWSS3PropertyFactory withMaxMessagesPerPoll(int value) {
-        return setProperty("camel.source.endpoint.maxMessagesPerPoll", Integer.toString(value));
-    }
-
-    public CamelAWSS3PropertyFactory withBucketNameOrArn(String bucketNameOrArn) {
-        return setProperty("camel.source.path.bucketNameOrArn", bucketNameOrArn);
-    }
-
-    public CamelAWSS3PropertyFactory withConfiguration(String configurationClass) {
-        return setProperty("camel.component.aws-s3.configuration", classRef(configurationClass));
-    }
-
-    public static CamelAWSS3PropertyFactory basic() {
-        return new CamelAWSS3PropertyFactory().withName("CamelAwss3SourceConnector").withTasksMax(1)
-                .withConnectorClass("org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector")
-                .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
-                .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
deleted file mode 100644
index 87fa9ad..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.s3.source;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.ListVersionsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.amazonaws.services.s3.model.S3VersionSummary;
-import com.amazonaws.services.s3.model.VersionListing;
-import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
-import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-import org.apache.camel.test.infra.aws.common.AWSCommon;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
-public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
-
-    @RegisterExtension
-    public static AWSService service = AWSServiceFactory.createS3Service();
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
-
-    private AmazonS3 awsS3Client;
-    private volatile int received;
-    private final int expect = 10;
-
-    /**
-     * Delete an S3 bucket using the provided client. Coming from AWS documentation:
-     * https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-or-empty-bucket.html#delete-bucket-sdk-java
-     *
-     * @param s3Client
-     *            the AmazonS3 client instance used to delete the bucket
-     * @param bucketName
-     *            a String containing the bucket name
-     */
-    public static void deleteBucket(AmazonS3 s3Client, String bucketName) {
-        // Delete all objects from the bucket. This is sufficient
-        // for non versioned buckets. For versioned buckets, when you attempt to delete objects, Amazon S3 inserts
-        // delete markers for all objects, but doesn't delete the object versions.
-        // To delete objects from versioned buckets, delete all of the object versions before deleting
-        // the bucket (see below for an example).
-        ObjectListing objectListing = s3Client.listObjects(bucketName);
-        while (true) {
-            Iterator<S3ObjectSummary> objIter = objectListing.getObjectSummaries().iterator();
-            while (objIter.hasNext()) {
-                s3Client.deleteObject(bucketName, objIter.next().getKey());
-            }
-
-            // If the bucket contains many objects, the listObjects() call
-            // might not return all of the objects in the first listing. Check to
-            // see whether the listing was truncated. If so, retrieve the next page of objects
-            // and delete them.
-            if (objectListing.isTruncated()) {
-                objectListing = s3Client.listNextBatchOfObjects(objectListing);
-            } else {
-                break;
-            }
-        }
-
-        // Delete all object versions (required for versioned buckets).
-        VersionListing versionList = s3Client.listVersions(new ListVersionsRequest().withBucketName(bucketName));
-        while (true) {
-            Iterator<S3VersionSummary> versionIter = versionList.getVersionSummaries().iterator();
-            while (versionIter.hasNext()) {
-                S3VersionSummary vs = versionIter.next();
-                s3Client.deleteVersion(bucketName, vs.getKey(), vs.getVersionId());
-            }
-
-            if (versionList.isTruncated()) {
-                versionList = s3Client.listNextBatchOfVersions(versionList);
-            } else {
-                break;
-            }
-        }
-
-        // After all objects and object versions are deleted, delete the bucket.
-        s3Client.deleteBucket(bucketName);
-    }
-
-    @Override
-    protected String[] getConnectorsInTest() {
-        return new String[] {"camel-aws-s3-kafka-connector"};
-    }
-
-    @BeforeEach
-    public void setUp() {
-        awsS3Client = AWSClientUtils.newS3Client();
-        received = 0;
-
-        try {
-            awsS3Client.createBucket(AWSCommon.DEFAULT_S3_BUCKET);
-        } catch (Exception e) {
-            LOG.error("Unable to create bucket: {}", e.getMessage(), e);
-            fail("Unable to create bucket");
-        }
-    }
-
-    @AfterEach
-    public void tearDown() {
-        try {
-            deleteBucket(awsS3Client, AWSCommon.DEFAULT_S3_BUCKET);
-        } catch (Exception e) {
-            LOG.warn("Unable to delete bucked: {}", e.getMessage(), e);
-        }
-    }
-
-    private boolean checkRecord(ConsumerRecord<String, String> record) {
-        LOG.debug("Received: {}", record.value());
-        received++;
-
-        if (received == expect) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public void runTest(ConnectorPropertyFactory connectorPropertyFactory)
-            throws ExecutionException, InterruptedException {
-        connectorPropertyFactory.log();
-        getKafkaConnectService().initializeConnector(connectorPropertyFactory);
-
-        LOG.debug("Putting S3 objects");
-        for (int i = 0; i < expect; i++) {
-            String name = "file" + i + ".test";
-            String file = this.getClass().getResource(name).getFile();
-
-            LOG.trace("Putting file {}", file);
-            awsS3Client.putObject(AWSCommon.DEFAULT_S3_BUCKET, name, new File(file));
-        }
-        LOG.debug("Done putting S3S objects");
-
-        LOG.debug("Creating the consumer ...");
-        KafkaClient<String, String> kafkaClient = new KafkaClient<>(getKafkaService().getBootstrapServers());
-        kafkaClient.consume(TestUtils.getDefaultTestTopic(this.getClass()), this::checkRecord);
-        LOG.debug("Created the consumer ...");
-
-        assertEquals(received, expect, "Didn't process the expected amount of messages");
-    }
-
-    @Test
-    @Timeout(180)
-    public void testBasicSendReceive() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSS3PropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withConfiguration(TestS3Configuration.class.getName()).withBucketNameOrArn(AWSCommon.DEFAULT_S3_BUCKET)
-                .withAmazonConfig(service.getConnectionProperties());
-
-        runTest(connectorPropertyFactory);
-    }
-
-    @Test
-    @Timeout(180)
-    public void testBasicSendReceiveWithMaxMessagesPerPoll() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSS3PropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withConfiguration(TestS3Configuration.class.getName()).withMaxMessagesPerPoll(5)
-                .withBucketNameOrArn(AWSCommon.DEFAULT_S3_BUCKET).withAmazonConfig(service.getConnectionProperties());
-
-        runTest(connectorPropertyFactory);
-    }
-
-    @Test
-    @Timeout(180)
-    public void testBasicSendReceiveWithKafkaStyle() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSS3PropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withConfiguration(TestS3Configuration.class.getName()).withBucketNameOrArn(AWSCommon.DEFAULT_S3_BUCKET)
-                .withAmazonConfig(service.getConnectionProperties(), CamelAWSS3PropertyFactory.KAFKA_STYLE);
-
-        runTest(connectorPropertyFactory);
-    }
-
-    @Test
-    @Timeout(180)
-    public void testBasicSendReceiveUsingUrl() throws ExecutionException, InterruptedException {
-        Properties amazonProperties = service.getConnectionProperties();
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSS3PropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass()))
-                .withConfiguration(TestS3Configuration.class.getName()).withUrl(AWSCommon.DEFAULT_S3_BUCKET)
-                .append("accessKey", amazonProperties.getProperty(AWSConfigs.ACCESS_KEY))
-                .append("secretKey", amazonProperties.getProperty(AWSConfigs.SECRET_KEY))
-                .appendIfAvailable("proxyProtocol", amazonProperties.getProperty(AWSConfigs.PROTOCOL))
-                .append("region", amazonProperties.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name())).buildUrl();
-
-        runTest(connectorPropertyFactory);
-    }
-
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/TestS3Configuration.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/TestS3Configuration.java
deleted file mode 100644
index a0ae33e..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/TestS3Configuration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.s3.source;
-
-import com.amazonaws.services.s3.AmazonS3;
-import org.apache.camel.component.aws.s3.S3Configuration;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-
-public class TestS3Configuration extends S3Configuration {
-    private AmazonS3 amazonS3;
-
-    private AmazonS3 buildClient() {
-        return AWSClientUtils.newS3Client();
-    }
-
-    @Override
-    public AmazonS3 getAmazonS3Client() {
-        if (amazonS3 == null) {
-            amazonS3 = buildClient();
-        }
-
-        return amazonS3;
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelAWSSNSPropertyFactory.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelAWSSNSPropertyFactory.java
deleted file mode 100644
index 7bab323..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelAWSSNSPropertyFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sns.sink;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.common.EndpointUrlBuilder;
-import org.apache.camel.kafkaconnector.common.SinkConnectorPropertyFactory;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-
-/**
- * Creates the set of properties used by a Camel JMS Sink Connector
- */
-final class CamelAWSSNSPropertyFactory extends SinkConnectorPropertyFactory<CamelAWSSNSPropertyFactory> {
-    public static final Map<String, String> SPRING_STYLE = new HashMap<>();
-    public static final Map<String, String> KAFKA_STYLE = new HashMap<>();
-
-    static {
-        SPRING_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sns.accessKey");
-        SPRING_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sns.secretKey");
-        SPRING_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sns.region");
-
-        KAFKA_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sns.access-key");
-        KAFKA_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sns.secret-key");
-        KAFKA_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sns.region");
-    }
-
-    private CamelAWSSNSPropertyFactory() {
-    }
-
-    public EndpointUrlBuilder<CamelAWSSNSPropertyFactory> withUrl(String topicOrArn) {
-        String sinkUrl = String.format("aws-sns:%s", topicOrArn);
-
-        return new EndpointUrlBuilder<>(this::withSinkUrl, sinkUrl);
-    }
-
-    public CamelAWSSNSPropertyFactory withTopicOrArn(String topicOrArn) {
-        return setProperty("camel.sink.path.topicNameOrArn", topicOrArn);
-    }
-
-    public CamelAWSSNSPropertyFactory withSubscribeSNStoSQS(String queue) {
-        return setProperty("camel.sink.endpoint.subscribeSNStoSQS", "true").setProperty("camel.sink.endpoint.queueUrl",
-                queue);
-    }
-
-    public CamelAWSSNSPropertyFactory withAmazonConfig(Properties amazonConfigs) {
-        return withAmazonConfig(amazonConfigs, this.SPRING_STYLE);
-    }
-
-    public CamelAWSSNSPropertyFactory withAmazonConfig(Properties amazonConfigs, Map<String, String> style) {
-        String accessKeyKey = style.get(AWSConfigs.ACCESS_KEY);
-        String secretKeyKey = style.get(AWSConfigs.SECRET_KEY);
-        String regionKey = style.get(AWSConfigs.REGION);
-
-        setProperty(accessKeyKey, amazonConfigs.getProperty(AWSConfigs.ACCESS_KEY, ""));
-        setProperty(secretKeyKey, amazonConfigs.getProperty(AWSConfigs.SECRET_KEY, ""));
-        return setProperty(regionKey, amazonConfigs.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()));
-    }
-
-    public CamelAWSSNSPropertyFactory withConfiguration(String configurationClass) {
-        return setProperty("camel.component.aws-sns.configuration", classRef(configurationClass));
-    }
-
-    public static CamelAWSSNSPropertyFactory basic() {
-        return new CamelAWSSNSPropertyFactory().withName("CamelAWSSNSSinkConnector").withTasksMax(1)
-                .withConnectorClass("org.apache.camel.kafkaconnector.awssns.CamelAwssnsSinkConnector")
-                .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
-                .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
deleted file mode 100644
index aea8c76..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sns.sink;
-
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.sqs.model.Message;
-import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
-import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-import org.apache.camel.test.infra.aws.common.AWSCommon;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
-public class CamelSinkAWSSNSITCase extends CamelSinkTestSupport {
-
-    @RegisterExtension
-    public static AWSService service = AWSServiceFactory.createSNSService();
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSNSITCase.class);
-
-    private AWSSQSClient awsSqsClient;
-    private String sqsQueueUrl;
-    private String queueName;
-    private String topicName;
-
-    private volatile int received;
-    private final int expect = 10;
-
-    @Override
-    protected String[] getConnectorsInTest() {
-        return new String[] {"camel-aws-sns-kafka-connector"};
-    }
-
-    @BeforeEach
-    public void setUp() {
-        topicName = getTopicForTest(this);
-
-        awsSqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
-        queueName = AWSCommon.DEFAULT_SQS_QUEUE_FOR_SNS + "-" + TestUtils.randomWithRange(0, 1000);
-        sqsQueueUrl = awsSqsClient.getQueue(queueName);
-
-        LOG.info("Created SQS queue {}", sqsQueueUrl);
-        received = 0;
-    }
-
-    @Override
-    protected void verifyMessages(CountDownLatch latch) throws InterruptedException {
-        if (latch.await(120, TimeUnit.SECONDS)) {
-            assertEquals(expect, received,
-                    "Didn't process the expected amount of messages: " + received + " != " + expect);
-        } else {
-            fail("Failed to receive the messages within the specified time");
-        }
-    }
-
-    private boolean checkMessages(List<Message> messages) {
-        for (Message message : messages) {
-            LOG.info("Received: {}", message.getBody());
-
-            received++;
-        }
-
-        if (received == expect) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    protected void consumeMessages(CountDownLatch latch) {
-        try {
-            awsSqsClient.receiveFrom(sqsQueueUrl, this::checkMessages);
-        } catch (Throwable t) {
-            LOG.error("Failed to consume messages: {}", t.getMessage(), t);
-            fail(t.getMessage());
-        } finally {
-            latch.countDown();
-        }
-    }
-
-    @Test
-    @Timeout(value = 90)
-    public void testBasicSendReceive() throws Exception {
-        Properties amazonProperties = service.getConnectionProperties();
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSNSPropertyFactory.basic()
-                .withName("CamelAWSSNSSinkConnectorDefault")
-                .withTopics(topicName)
-                .withTopicOrArn(queueName)
-                .withSubscribeSNStoSQS(sqsQueueUrl).withConfiguration(TestSNSConfiguration.class.getName())
-                .withAmazonConfig(amazonProperties);
-
-        runTest(connectorPropertyFactory, topicName, expect);
-    }
-
-    @Test
-    @Timeout(value = 90)
-    public void testBasicSendReceiveUsingKafkaStyle() throws Exception {
-        Properties amazonProperties = service.getConnectionProperties();
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSNSPropertyFactory.basic()
-                .withName("CamelAWSSNSSinkKafkaStyleConnector")
-                .withTopics(topicName)
-                .withTopicOrArn(queueName)
-                .withSubscribeSNStoSQS(sqsQueueUrl).withConfiguration(TestSNSConfiguration.class.getName())
-                .withAmazonConfig(amazonProperties, CamelAWSSNSPropertyFactory.KAFKA_STYLE);
-
-        runTest(connectorPropertyFactory, topicName, expect);
-    }
-
-    @Disabled("AWS SNS component is failing to parse the sink URL for this one")
-    @Test
-    @Timeout(value = 90)
-    public void testBasicSendReceiveUsingUrl() throws Exception {
-        Properties amazonProperties = service.getConnectionProperties();
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSNSPropertyFactory.basic()
-                .withName("CamelAWSSNSSinkKafkaStyleConnector")
-                .withTopics(topicName)
-                .withUrl(queueName)
-                    .append("queueUrl", sqsQueueUrl).append("subscribeSNStoSQS", "true")
-                    .append("accessKey", amazonProperties.getProperty(AWSConfigs.ACCESS_KEY))
-                    .append("secretKey", amazonProperties.getProperty(AWSConfigs.SECRET_KEY))
-                    .append("region", amazonProperties.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()))
-                    .append("configuration", "#class:" + TestSNSConfiguration.class.getName())
-                    .buildUrl();
-
-        runTest(connectorPropertyFactory, topicName, expect);
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/TestSNSConfiguration.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/TestSNSConfiguration.java
deleted file mode 100644
index 98866ee..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/TestSNSConfiguration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sns.sink;
-
-import com.amazonaws.services.sns.AmazonSNS;
-import com.amazonaws.services.sqs.AmazonSQS;
-import org.apache.camel.component.aws.sns.SnsConfiguration;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-
-public class TestSNSConfiguration extends SnsConfiguration {
-
-    @Override
-    public AmazonSNS getAmazonSNSClient() {
-        return AWSClientUtils.newSNSClient();
-    }
-
-    @Override
-    public AmazonSQS getAmazonSQSClient() {
-        return AWSClientUtils.newSQSClient();
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelAWSSQSPropertyFactory.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelAWSSQSPropertyFactory.java
deleted file mode 100644
index ea5a7cf..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelAWSSQSPropertyFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sqs.sink;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.common.EndpointUrlBuilder;
-import org.apache.camel.kafkaconnector.common.SinkConnectorPropertyFactory;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-
-/**
- * Creates the set of properties used by a Camel JMS Sink Connector
- */
-final class CamelAWSSQSPropertyFactory extends SinkConnectorPropertyFactory<CamelAWSSQSPropertyFactory> {
-    public static final Map<String, String> SPRING_STYLE = new HashMap<>();
-    public static final Map<String, String> KAFKA_STYLE = new HashMap<>();
-
-    static {
-        SPRING_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sqs.accessKey");
-        SPRING_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sqs.secretKey");
-        SPRING_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sqs.region");
-        SPRING_STYLE.put(AWSConfigs.PROTOCOL, "camel.sink.endpoint.protocol");
-        SPRING_STYLE.put(AWSConfigs.AMAZON_AWS_HOST, "camel.sink.endpoint.amazonAWSHost");
-
-        KAFKA_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sqs.access-key");
-        KAFKA_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sqs.secret-key");
-        KAFKA_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sqs.region");
-        KAFKA_STYLE.put(AWSConfigs.PROTOCOL, "camel.sink.endpoint.protocol");
-        KAFKA_STYLE.put(AWSConfigs.AMAZON_AWS_HOST, "camel.sink.endpoint.amazonAWSHost");
-    }
-
-    private CamelAWSSQSPropertyFactory() {
-    }
-
-    public CamelAWSSQSPropertyFactory withAmazonConfig(Properties amazonConfigs) {
-        return withAmazonConfig(amazonConfigs, this.SPRING_STYLE);
-    }
-
-    public CamelAWSSQSPropertyFactory withAmazonConfig(Properties amazonConfigs, Map<String, String> style) {
-        String accessKeyKey = style.get(AWSConfigs.ACCESS_KEY);
-        String secretKeyKey = style.get(AWSConfigs.SECRET_KEY);
-        String regionKey = style.get(AWSConfigs.REGION);
-        String protocolKey = style.get(AWSConfigs.PROTOCOL);
-        String hostKey = style.get(AWSConfigs.AMAZON_AWS_HOST);
-
-        setProperty(accessKeyKey, amazonConfigs.getProperty(AWSConfigs.ACCESS_KEY, ""));
-        setProperty(secretKeyKey, amazonConfigs.getProperty(AWSConfigs.SECRET_KEY, ""));
-        setProperty(regionKey, amazonConfigs.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()));
-
-        String protocol = amazonConfigs.getProperty(AWSConfigs.PROTOCOL, "");
-
-        if (protocol != null && !protocol.isEmpty()) {
-            setProperty(protocolKey, protocol);
-        }
-
-        String amazonAwsHost = amazonConfigs.getProperty(AWSConfigs.AMAZON_AWS_HOST, "");
-        if (amazonAwsHost != null && !amazonAwsHost.isEmpty()) {
-            setProperty(hostKey, amazonAwsHost);
-        }
-
-        return this;
-    }
-
-    public CamelAWSSQSPropertyFactory withConfiguration(String configurationClass) {
-        return setProperty("camel.component.aws-sqs.configuration", classRef(configurationClass));
-    }
-
-    public EndpointUrlBuilder<CamelAWSSQSPropertyFactory> withUrl(String queueNameOrArn) {
-        String queueUrl = String.format("aws-sqs://%s", queueNameOrArn);
-
-        return new EndpointUrlBuilder<>(this::withSinkUrl, queueUrl);
-    }
-
-    public CamelAWSSQSPropertyFactory withQueueNameOrArn(String queueNameOrArn) {
-        return setProperty("camel.sink.path.queueNameOrArn", queueNameOrArn);
-    }
-
-    public static CamelAWSSQSPropertyFactory basic() {
-        return new CamelAWSSQSPropertyFactory().withName("CamelAwssqsSinkConnector").withTasksMax(1)
-                .withConnectorClass("org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSinkConnector")
-                .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
-                .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
-    }
-
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
deleted file mode 100644
index 894114f..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sqs.sink;
-
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.sqs.model.Message;
-import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
-import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-import org.apache.camel.test.infra.aws.common.AWSCommon;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.RepeatedTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
-public class CamelSinkAWSSQSITCase extends CamelSinkTestSupport {
-
-    @RegisterExtension
-    public static AWSService awsService = AWSServiceFactory.createSQSService();
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
-
-    private AWSSQSClient awssqsClient;
-    private String queueName;
-    private String queueUrl;
-    private String topicName;
-
-    private volatile int received;
-    private final int expect = 10;
-
-    @Override
-    protected String[] getConnectorsInTest() {
-        return new String[] {"camel-aws-sqs-kafka-connector"};
-    }
-
-    @BeforeEach
-    public void setUp() {
-        topicName = getTopicForTest(this);
-        awssqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
-
-        queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
-        queueUrl = awssqsClient.getQueue(queueName);
-
-        LOG.debug("Using queue {} for the test", queueUrl);
-
-        received = 0;
-    }
-
-    @AfterEach
-    public void tearDown() {
-        if (!awssqsClient.deleteQueue(queueName)) {
-            fail("Failed to delete queue");
-        }
-    }
-
-    @Override
-    protected void verifyMessages(CountDownLatch latch) throws InterruptedException {
-        if (latch.await(110, TimeUnit.SECONDS)) {
-            assertEquals(expect, received,
-                    "Didn't process the expected amount of messages: " + received + " != " + expect);
-        } else {
-            fail(String.format("Failed to receive the messages within the specified time: received %d of %d", received,
-                    expect));
-        }
-    }
-
-    private boolean checkMessages(List<Message> messages) {
-        for (Message message : messages) {
-            LOG.info("Received: {}", message.getBody());
-
-            received++;
-        }
-
-        if (received == expect) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    protected void consumeMessages(CountDownLatch latch) {
-        try {
-            awssqsClient.receiveFrom(queueUrl, this::checkMessages);
-        } catch (Throwable t) {
-            LOG.error("Failed to consume messages: {}", t.getMessage(), t);
-        } finally {
-            latch.countDown();
-        }
-    }
-
-    @Test
-    @Timeout(value = 120)
-    public void testBasicSendReceive() throws Exception {
-        Properties amazonProperties = awsService.getConnectionProperties();
-
-        ConnectorPropertyFactory testProperties = CamelAWSSQSPropertyFactory.basic()
-                .withName("CamelAwssqsSinkConnectorSpringBootStyle")
-                .withTopics(topicName)
-                .withAmazonConfig(amazonProperties)
-                .withQueueNameOrArn(queueName);
-
-        runTest(testProperties, topicName, expect);
-
-    }
-
-    @DisabledIfSystemProperty(named = "aws-service.instance.type", matches = "remote")
-    @Timeout(value = 120)
-    @RepeatedTest(3)
-    public void testBasicSendReceiveUsingKafkaStyle() throws Exception {
-        Properties amazonProperties = awsService.getConnectionProperties();
-
-        ConnectorPropertyFactory testProperties = CamelAWSSQSPropertyFactory.basic()
-                .withName("CamelAwssqsSinkConnectorKafkaStyle")
-                .withTopics(topicName)
-                .withAmazonConfig(amazonProperties, CamelAWSSQSPropertyFactory.KAFKA_STYLE)
-                .withQueueNameOrArn(queueName);
-
-        runTest(testProperties, topicName, expect);
-    }
-
-    @DisabledIfSystemProperty(named = "aws-service.instance.type", matches = "remote")
-    @Timeout(value = 120)
-    @RepeatedTest(3)
-    public void testBasicSendReceiveUsingUrl() throws Exception {
-        Properties amazonProperties = awsService.getConnectionProperties();
-
-        ConnectorPropertyFactory testProperties = CamelAWSSQSPropertyFactory.basic()
-                .withName("CamelAwssqsSinkConnectorUsingUrl")
-                .withTopics(topicName)
-                .withUrl(queueName)
-                    .append("autoCreateQueue", "true")
-                    .append("accessKey", amazonProperties.getProperty(AWSConfigs.ACCESS_KEY))
-                    .append("secretKey", amazonProperties.getProperty(AWSConfigs.SECRET_KEY))
-                    .append("protocol", amazonProperties.getProperty(AWSConfigs.PROTOCOL))
-                    .append("region", amazonProperties.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()))
-                    .append("amazonAWSHost", amazonProperties.getProperty(AWSConfigs.AMAZON_AWS_HOST))
-                .buildUrl();
-
-        runTest(testProperties, topicName, expect);
-    }
-
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelAWSSQSPropertyFactory.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelAWSSQSPropertyFactory.java
deleted file mode 100644
index 930dc1a..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelAWSSQSPropertyFactory.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sqs.source;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.common.EndpointUrlBuilder;
-import org.apache.camel.kafkaconnector.common.SourceConnectorPropertyFactory;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-
-/**
- * Creates the set of properties used by a Camel JMS Sink Connector
- */
-final class CamelAWSSQSPropertyFactory extends SourceConnectorPropertyFactory<CamelAWSSQSPropertyFactory> {
-    public static final Map<String, String> SPRING_STYLE = new HashMap<>();
-    public static final Map<String, String> KAFKA_STYLE = new HashMap<>();
-
-    static {
-        SPRING_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sqs.accessKey");
-        SPRING_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sqs.secretKey");
-        SPRING_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sqs.region");
-        SPRING_STYLE.put(AWSConfigs.PROTOCOL, "camel.source.endpoint.protocol");
-        SPRING_STYLE.put(AWSConfigs.AMAZON_AWS_HOST, "camel.source.endpoint.amazonAWSHost");
-
-        KAFKA_STYLE.put(AWSConfigs.ACCESS_KEY, "camel.component.aws-sqs.access-key");
-        KAFKA_STYLE.put(AWSConfigs.SECRET_KEY, "camel.component.aws-sqs.secret-key");
-        KAFKA_STYLE.put(AWSConfigs.REGION, "camel.component.aws-sqs.region");
-        KAFKA_STYLE.put(AWSConfigs.PROTOCOL, "camel.source.endpoint.protocol");
-        KAFKA_STYLE.put(AWSConfigs.AMAZON_AWS_HOST, "camel.source.endpoint.amazonAWSHost");
-    }
-
-    private CamelAWSSQSPropertyFactory() {
-
-    }
-
-    public CamelAWSSQSPropertyFactory withAmazonConfig(Properties amazonConfigs) {
-        return withAmazonConfig(amazonConfigs, this.SPRING_STYLE);
-    }
-
-    public CamelAWSSQSPropertyFactory withAmazonConfig(Properties amazonConfigs, Map<String, String> style) {
-        String accessKeyKey = style.get(AWSConfigs.ACCESS_KEY);
-        String secretKeyKey = style.get(AWSConfigs.SECRET_KEY);
-        String regionKey = style.get(AWSConfigs.REGION);
-        String protocolKey = style.get(AWSConfigs.PROTOCOL);
-        String hostKey = style.get(AWSConfigs.AMAZON_AWS_HOST);
-
-        setProperty(accessKeyKey, amazonConfigs.getProperty(AWSConfigs.ACCESS_KEY, ""));
-        setProperty(secretKeyKey, amazonConfigs.getProperty(AWSConfigs.SECRET_KEY, ""));
-        setProperty(regionKey, amazonConfigs.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name()));
-
-        String protocol = amazonConfigs.getProperty(AWSConfigs.PROTOCOL, "");
-        if (protocol != null && !protocol.isEmpty()) {
-            setProperty(protocolKey, protocol);
-        }
-
-        String amazonAwsHost = amazonConfigs.getProperty(AWSConfigs.AMAZON_AWS_HOST, "");
-        if (amazonAwsHost != null && !amazonAwsHost.isEmpty()) {
-            setProperty(hostKey, amazonAwsHost);
-        }
-
-        return this;
-    }
-
-    public CamelAWSSQSPropertyFactory withQueueOrArn(String queueOrArn) {
-        return setProperty("camel.source.path.queueNameOrArn", queueOrArn);
-    }
-
-    public EndpointUrlBuilder<CamelAWSSQSPropertyFactory> withUrl(String queueOrArn) {
-        String queueUrl = String.format("aws-sqs://%s", queueOrArn);
-
-        return new EndpointUrlBuilder<>(this::withSourceUrl, queueUrl);
-    }
-
-    public static CamelAWSSQSPropertyFactory basic() {
-        return new CamelAWSSQSPropertyFactory().withName("CamelAwssqsSourceConnector").withTasksMax(1)
-                .withConnectorClass("org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSourceConnector")
-                .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
-                .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
deleted file mode 100644
index 608c12d..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.sqs.source;
-
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-
-import com.amazonaws.regions.Regions;
-import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
-import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
-import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
-import org.apache.camel.test.infra.aws.common.AWSCommon;
-import org.apache.camel.test.infra.aws.common.AWSConfigs;
-import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
-public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
-
-    @RegisterExtension
-    public static AWSService service = AWSServiceFactory.createSQSService();
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
-
-
-    private AWSSQSClient awssqsClient;
-    private String queueName;
-    private String queueUrl;
-
-    private volatile int received;
-    private final int expect = 10;
-
-    @Override
-    protected String[] getConnectorsInTest() {
-        return new String[] {"camel-aws-sqs-kafka-connector"};
-    }
-
-    @BeforeEach
-    public void setUp() {
-        awssqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
-        queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
-
-        queueUrl = awssqsClient.getQueue(queueName);
-        received = 0;
-    }
-
-    @AfterEach
-    public void tearDown() {
-        if (!awssqsClient.deleteQueue(queueName)) {
-            fail("Failed to delete queue");
-        }
-    }
-
-    private boolean checkRecord(ConsumerRecord<String, String> record) {
-        LOG.debug("Received: {}", record.value());
-        received++;
-
-        if (received == expect) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public void runTest(ConnectorPropertyFactory connectorPropertyFactory)
-            throws ExecutionException, InterruptedException {
-        connectorPropertyFactory.log();
-        getKafkaConnectService().initializeConnector(connectorPropertyFactory);
-
-        LOG.debug("Sending SQS messages");
-        for (int i = 0; i < expect; i++) {
-            awssqsClient.sendTo(queueUrl, "Source test message " + i);
-        }
-        LOG.debug("Done sending SQS messages");
-
-        LOG.debug("Creating the consumer ...");
-        KafkaClient<String, String> kafkaClient = new KafkaClient<>(getKafkaService().getBootstrapServers());
-        kafkaClient.consume(TestUtils.getDefaultTestTopic(this.getClass()), this::checkRecord);
-        LOG.debug("Created the consumer ...");
-
-        assertEquals(received, expect, "Didn't process the expected amount of messages");
-    }
-
-    @Test
-    @Timeout(90)
-    public void testBasicSendReceive() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSQSPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass())).withQueueOrArn(queueName)
-                .withAmazonConfig(service.getConnectionProperties());
-
-        runTest(connectorPropertyFactory);
-    }
-
-    // This test does not run remotely because SQS has a cool down period for
-    // creating and removing the SQS queue
-    @DisabledIfSystemProperty(named = "aws-service.instance.type", matches = "remote")
-    @Test
-    @Timeout(90)
-    public void testBasicSendReceiveWithKafkaStyle() throws ExecutionException, InterruptedException {
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSQSPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass())).withQueueOrArn(queueName)
-                .withAmazonConfig(service.getConnectionProperties(), CamelAWSSQSPropertyFactory.KAFKA_STYLE);
-
-        runTest(connectorPropertyFactory);
-    }
-
-    // This test does not run remotely because SQS has a cool down period for
-    // creating and removing the SQS queue
-    @DisabledIfSystemProperty(named = "aws-service.instance.type", matches = "remote")
-    @Test
-    @Timeout(90)
-    public void testBasicSendReceiveUsingUrl() throws ExecutionException, InterruptedException {
-        Properties amazonProperties = service.getConnectionProperties();
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelAWSSQSPropertyFactory.basic()
-                .withKafkaTopic(TestUtils.getDefaultTestTopic(this.getClass())).withUrl(queueName)
-                .append("accessKey", amazonProperties.getProperty(AWSConfigs.ACCESS_KEY))
-                .append("secretKey", amazonProperties.getProperty(AWSConfigs.SECRET_KEY))
-                .append("protocol", amazonProperties.getProperty(AWSConfigs.PROTOCOL))
-                .appendIfAvailable("amazonAWSHost", amazonProperties.getProperty(AWSConfigs.AMAZON_AWS_HOST))
-                .append("region", amazonProperties.getProperty(AWSConfigs.REGION, Regions.US_EAST_1.name())).buildUrl();
-
-        runTest(connectorPropertyFactory);
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file0.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file0.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file0.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file1.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file1.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file1.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file2.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file2.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file2.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file3.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file3.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file3.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file4.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file4.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file4.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file5.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file5.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file5.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file6.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file6.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file6.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file7.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file7.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file7.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file8.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file8.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file8.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file9.test b/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file9.test
deleted file mode 100644
index fc590f9..0000000
--- a/tests/itests-aws-v1/src/test/resources/org/apache/camel/kafkaconnector/aws/v1/s3/source/file9.test
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index 6da0d7c..5d1a6de 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -42,7 +42,6 @@
         <module>itests-parent</module>
         <module>itests-common</module>
         <module>itests-common-http</module>
-        <module>itests-aws-v1</module>
         <module>itests-aws-v2</module>
         <module>itests-cassandra</module>
         <module>itests-elasticsearch</module>

[camel-kafka-connector] 07/09: Align to 3.9.0

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

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

commit d660dd6c6bab23db49b159daf193dc890d70b4b8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:43:14 2021 +0200

    Align to 3.9.0
---
 .../resources/connectors/camel-kafka-source.json   |  32 ++++++
 .../connectors/camel-netty-http-sink.json          |  14 +++
 .../connectors/camel-netty-http-source.json        |  14 +++
 .../resources/connectors/camel-netty-sink.json     |  14 +++
 .../resources/connectors/camel-netty-source.json   |  14 +++
 .../resources/connectors/camel-resteasy-sink.json  | 108 +++++++++++++++----
 .../connectors/camel-resteasy-source.json          |  89 ++++++++++++----
 .../resources/connectors/camel-servlet-source.json |  28 ++---
 .../resources/connectors/camel-slack-sink.json     |  12 +++
 .../resources/connectors/camel-slack-source.json   |  38 +++++--
 .../resources/connectors/camel-smpp-sink.json      |   4 +-
 .../resources/connectors/camel-smpp-source.json    |   4 +-
 .../resources/connectors/camel-smpps-sink.json     |   4 +-
 .../resources/connectors/camel-smpps-source.json   |   4 +-
 .../resources/connectors/camel-splunk-sink.json    |   6 ++
 .../connectors/camel-spring-rabbitmq-sink.json     |  14 +++
 .../connectors/camel-spring-rabbitmq-source.json   | 107 +++++++++++++++++++
 .../connectors/camel-vertx-http-sink.json          |  14 +++
 .../connectors/camel-vertx-kafka-source.json       |  20 ++++
 .../resources/descriptors/connectors.properties    |  32 +-----
 .../catalog/CamelKafkaConnectorCatalogTest.java    |   2 +-
 .../resources/camel-atmosphere-websocket-sink.json |  21 ----
 .../camel-atmosphere-websocket-source.json         |  28 ++---
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   4 +-
 ...amelAtmospherewebsocketSinkConnectorConfig.java |  12 ---
 ...elAtmospherewebsocketSourceConnectorConfig.java |  16 +--
 .../generated/resources/camel-aws2-cw-sink.json    |  26 +++++
 .../docs/camel-aws2-cw-kafka-sink-connector.adoc   |   6 +-
 .../aws2cw/CamelAws2cwSinkConnectorConfig.java     |  16 +++
 .../generated/resources/camel-aws2-ddb-sink.json   |  26 +++++
 .../docs/camel-aws2-ddb-kafka-sink-connector.adoc  |   6 +-
 .../aws2ddb/CamelAws2ddbSinkConnectorConfig.java   |  16 +++
 .../resources/camel-aws2-ddbstream-source.json     |  26 +++++
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   6 +-
 .../CamelAws2ddbstreamSourceConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-ec2-sink.json   |  26 +++++
 .../docs/camel-aws2-ec2-kafka-sink-connector.adoc  |   6 +-
 .../aws2ec2/CamelAws2ec2SinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-ecs-sink.json   |  26 +++++
 .../docs/camel-aws2-ecs-kafka-sink-connector.adoc  |   6 +-
 .../aws2ecs/CamelAws2ecsSinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-eks-sink.json   |  26 +++++
 .../docs/camel-aws2-eks-kafka-sink-connector.adoc  |   6 +-
 .../aws2eks/CamelAws2eksSinkConnectorConfig.java   |  16 +++
 .../resources/camel-aws2-eventbridge-sink.json     |  26 +++++
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   6 +-
 .../CamelAws2eventbridgeSinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-iam-sink.json   |  26 +++++
 .../docs/camel-aws2-iam-kafka-sink-connector.adoc  |   6 +-
 .../aws2iam/CamelAws2iamSinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-kms-sink.json   |  26 +++++
 .../docs/camel-aws2-kms-kafka-sink-connector.adoc  |   6 +-
 .../aws2kms/CamelAws2kmsSinkConnectorConfig.java   |  16 +++
 .../resources/camel-aws2-lambda-sink.json          |  26 +++++
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   6 +-
 .../CamelAws2lambdaSinkConnectorConfig.java        |  16 +++
 .../generated/resources/camel-aws2-mq-sink.json    |  26 +++++
 .../docs/camel-aws2-mq-kafka-sink-connector.adoc   |   6 +-
 .../aws2mq/CamelAws2mqSinkConnectorConfig.java     |  16 +++
 .../generated/resources/camel-aws2-msk-sink.json   |  26 +++++
 .../docs/camel-aws2-msk-kafka-sink-connector.adoc  |   6 +-
 .../aws2msk/CamelAws2mskSinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-s3-sink.json    |   4 +-
 .../generated/resources/camel-aws2-s3-source.json  |   4 +-
 .../docs/camel-aws2-s3-kafka-sink-connector.adoc   |   4 +-
 .../docs/camel-aws2-s3-kafka-source-connector.adoc |   4 +-
 .../aws2s3/CamelAws2s3SinkConnectorConfig.java     |   4 +-
 .../aws2s3/CamelAws2s3SourceConnectorConfig.java   |   4 +-
 .../generated/resources/camel-aws2-ses-sink.json   |  26 +++++
 .../docs/camel-aws2-ses-kafka-sink-connector.adoc  |   6 +-
 .../aws2ses/CamelAws2sesSinkConnectorConfig.java   |  16 +++
 .../generated/resources/camel-aws2-sns-sink.json   |  30 +++++-
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |  10 +-
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   |  20 +++-
 .../generated/resources/camel-aws2-sqs-sink.json   |  44 +++++++-
 .../generated/resources/camel-aws2-sqs-source.json |  34 +++++-
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |  12 ++-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  14 ++-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |  28 ++++-
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |  24 ++++-
 .../generated/resources/camel-aws2-sts-sink.json   |  26 +++++
 .../docs/camel-aws2-sts-kafka-sink-connector.adoc  |   6 +-
 .../aws2sts/CamelAws2stsSinkConnectorConfig.java   |  16 +++
 .../resources/camel-aws2-translate-sink.json       |  26 +++++
 .../camel-aws2-translate-kafka-sink-connector.adoc |   6 +-
 .../CamelAws2translateSinkConnectorConfig.java     |  16 +++
 .../src/generated/resources/camel-file-sink.json   |   2 +-
 .../main/docs/camel-file-kafka-sink-connector.adoc |   2 +-
 .../file/CamelFileSinkConnectorConfig.java         |   2 +-
 .../generated/resources/camel-freemarker-sink.json |   7 ++
 .../camel-freemarker-kafka-sink-connector.adoc     |   3 +-
 .../CamelFreemarkerSinkConnectorConfig.java        |   4 +
 .../resources/camel-google-bigquery-sql-sink.json  |  12 +--
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   2 +-
 .../CamelGooglebigquerysqlSinkConnector.properties |   2 +-
 .../CamelGooglebigquerysqlSinkConnectorConfig.java |   8 +-
 .../resources/camel-google-mail-stream-source.json |   4 +-
 ...-google-mail-stream-kafka-source-connector.adoc |   4 +-
 ...CamelGooglemailstreamSourceConnectorConfig.java |   4 +-
 .../resources/camel-google-pubsub-sink.json        |  16 ++-
 .../resources/camel-google-pubsub-source.json      |  16 ++-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   8 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   8 +-
 .../CamelGooglepubsubSinkConnector.properties      |   8 +-
 .../CamelGooglepubsubSourceConnector.properties    |   8 +-
 .../CamelGooglepubsubSinkConnectorConfig.java      |  12 ++-
 .../CamelGooglepubsubSourceConnectorConfig.java    |  12 ++-
 .../src/generated/resources/camel-http-sink.json   | 114 +++++++++++++++++----
 .../main/docs/camel-http-kafka-sink-connector.adoc |  20 +++-
 .../http/CamelHttpSinkConnectorConfig.java         |  66 +++++++++---
 .../src/generated/resources/camel-https-sink.json  | 114 +++++++++++++++++----
 .../docs/camel-https-kafka-sink-connector.adoc     |  20 +++-
 .../https/CamelHttpsSinkConnectorConfig.java       |  66 +++++++++---
 .../generated/resources/camel-jetty-source.json    |  40 ++++----
 .../docs/camel-jetty-kafka-source-connector.adoc   |   6 +-
 .../jetty/CamelJettySourceConnectorConfig.java     |  24 ++---
 .../generated/resources/camel-kafka-source.json    |  32 ++++++
 .../docs/camel-kafka-kafka-source-connector.adoc   |   5 +-
 .../kafka/CamelKafkaSourceConnectorConfig.java     |  12 +++
 .../generated/resources/camel-netty-http-sink.json |  14 +++
 .../resources/camel-netty-http-source.json         |  14 +++
 .../camel-netty-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   4 +-
 .../CamelNettyhttpSinkConnectorConfig.java         |   8 ++
 .../CamelNettyhttpSourceConnectorConfig.java       |   8 ++
 .../src/generated/resources/camel-netty-sink.json  |  14 +++
 .../generated/resources/camel-netty-source.json    |  14 +++
 .../docs/camel-netty-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-netty-kafka-source-connector.adoc   |   4 +-
 .../netty/CamelNettySinkConnectorConfig.java       |   8 ++
 .../netty/CamelNettySourceConnectorConfig.java     |   8 ++
 .../generated/resources/camel-resteasy-sink.json   | 108 +++++++++++++++----
 .../generated/resources/camel-resteasy-source.json |  89 ++++++++++++----
 .../docs/camel-resteasy-kafka-sink-connector.adoc  |  20 +++-
 .../camel-resteasy-kafka-source-connector.adoc     |  15 ++-
 .../resteasy/CamelResteasySinkConnectorConfig.java |  66 +++++++++---
 .../CamelResteasySourceConnectorConfig.java        |  52 +++++++---
 .../generated/resources/camel-servlet-source.json  |  28 ++---
 .../docs/camel-servlet-kafka-source-connector.adoc |   4 +-
 .../servlet/CamelServletSourceConnectorConfig.java |  16 +--
 .../src/generated/resources/camel-slack-sink.json  |  12 +++
 .../generated/resources/camel-slack-source.json    |  38 +++++--
 .../docs/camel-slack-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-slack-kafka-source-connector.adoc   |   7 +-
 .../slack/CamelSlackSinkConnectorConfig.java       |   8 ++
 .../slack/CamelSlackSourceConnectorConfig.java     |  20 +++-
 .../src/generated/resources/camel-smpp-sink.json   |   4 +-
 .../src/generated/resources/camel-smpp-source.json |   4 +-
 .../main/docs/camel-smpp-kafka-sink-connector.adoc |   4 +-
 .../docs/camel-smpp-kafka-source-connector.adoc    |   4 +-
 .../smpp/CamelSmppSinkConnectorConfig.java         |   4 +-
 .../smpp/CamelSmppSourceConnectorConfig.java       |   4 +-
 .../src/generated/resources/camel-smpps-sink.json  |   4 +-
 .../generated/resources/camel-smpps-source.json    |   4 +-
 .../docs/camel-smpps-kafka-sink-connector.adoc     |   4 +-
 .../docs/camel-smpps-kafka-source-connector.adoc   |   4 +-
 .../smpps/CamelSmppsSinkConnectorConfig.java       |   4 +-
 .../smpps/CamelSmppsSourceConnectorConfig.java     |   4 +-
 .../src/generated/resources/camel-splunk-sink.json |   6 ++
 .../docs/camel-splunk-kafka-sink-connector.adoc    |   3 +-
 .../splunk/CamelSplunkSinkConnectorConfig.java     |   4 +
 .../resources/camel-spring-rabbitmq-sink.json      |  14 +++
 .../resources/camel-spring-rabbitmq-source.json    | 107 +++++++++++++++++++
 ...camel-spring-rabbitmq-kafka-sink-connector.adoc |   4 +-
 ...mel-spring-rabbitmq-kafka-source-connector.adoc |  17 ++-
 .../CamelSpringrabbitmqSinkConnectorConfig.java    |   8 ++
 .../CamelSpringrabbitmqSourceConnectorConfig.java  |  60 +++++++++++
 .../generated/resources/camel-vertx-http-sink.json |  14 +++
 .../camel-vertx-http-kafka-sink-connector.adoc     |   4 +-
 .../CamelVertxhttpSinkConnectorConfig.java         |   8 ++
 .../resources/camel-vertx-kafka-source.json        |  20 ++++
 .../camel-vertx-kafka-kafka-source-connector.adoc  |   5 +-
 .../CamelVertxkafkaSourceConnectorConfig.java      |  12 +++
 connectors/pom.xml                                 |   3 +
 docs/modules/ROOT/nav.adoc                         |  57 ++---------
 docs/modules/ROOT/pages/connectors.adoc            |  27 +----
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   4 +-
 .../camel-aws2-cw-kafka-sink-connector.adoc        |   6 +-
 .../camel-aws2-ddb-kafka-sink-connector.adoc       |   6 +-
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   6 +-
 .../camel-aws2-ec2-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-ecs-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-eks-kafka-sink-connector.adoc       |   6 +-
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   6 +-
 .../camel-aws2-iam-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-kms-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   6 +-
 .../camel-aws2-mq-kafka-sink-connector.adoc        |   6 +-
 .../camel-aws2-msk-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-s3-kafka-sink-connector.adoc        |   4 +-
 .../camel-aws2-s3-kafka-source-connector.adoc      |   4 +-
 .../camel-aws2-ses-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-sns-kafka-sink-connector.adoc       |  10 +-
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |  12 ++-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  14 ++-
 .../camel-aws2-sts-kafka-sink-connector.adoc       |   6 +-
 .../camel-aws2-translate-kafka-sink-connector.adoc |   6 +-
 .../camel-file-kafka-sink-connector.adoc           |   2 +-
 .../camel-freemarker-kafka-sink-connector.adoc     |   3 +-
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   2 +-
 ...-google-mail-stream-kafka-source-connector.adoc |   4 +-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   8 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   8 +-
 .../camel-http-kafka-sink-connector.adoc           |  20 +++-
 .../camel-https-kafka-sink-connector.adoc          |  20 +++-
 .../camel-jetty-kafka-source-connector.adoc        |   6 +-
 .../camel-kafka-kafka-source-connector.adoc        |   5 +-
 .../camel-netty-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   4 +-
 .../camel-netty-kafka-sink-connector.adoc          |   4 +-
 .../camel-netty-kafka-source-connector.adoc        |   4 +-
 .../camel-resteasy-kafka-sink-connector.adoc       |  20 +++-
 .../camel-resteasy-kafka-source-connector.adoc     |  15 ++-
 .../camel-servlet-kafka-source-connector.adoc      |   4 +-
 .../camel-slack-kafka-sink-connector.adoc          |   4 +-
 .../camel-slack-kafka-source-connector.adoc        |   7 +-
 .../camel-smpp-kafka-sink-connector.adoc           |   4 +-
 .../camel-smpp-kafka-source-connector.adoc         |   4 +-
 .../camel-smpps-kafka-sink-connector.adoc          |   4 +-
 .../camel-smpps-kafka-source-connector.adoc        |   4 +-
 .../camel-splunk-kafka-sink-connector.adoc         |   3 +-
 ...camel-spring-rabbitmq-kafka-sink-connector.adoc |   4 +-
 ...mel-spring-rabbitmq-kafka-source-connector.adoc |  17 ++-
 .../camel-vertx-http-kafka-sink-connector.adoc     |   4 +-
 .../camel-vertx-kafka-kafka-source-connector.adoc  |   5 +-
 227 files changed, 2956 insertions(+), 675 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
index 42ba6a0..04c880b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
@@ -220,6 +220,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.pollOnError": {
+			"name": "camel.source.endpoint.pollOnError",
+			"description": "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message again RETRY will let t [...]
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DISCARD",
+				"ERROR_HANDLER",
+				"RECONNECT",
+				"RETRY",
+				"STOP"
+			]
+		},
 		"camel.source.endpoint.pollTimeoutMs": {
 			"name": "camel.source.endpoint.pollTimeoutMs",
 			"description": "The timeout used when polling the KafkaConsumer.",
@@ -638,6 +651,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.pollOnError": {
+			"name": "camel.component.kafka.pollOnError",
+			"description": "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message again RETRY will let t [...]
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DISCARD",
+				"ERROR_HANDLER",
+				"RECONNECT",
+				"RETRY",
+				"STOP"
+			]
+		},
 		"camel.component.kafka.pollTimeoutMs": {
 			"name": "camel.component.kafka.pollTimeoutMs",
 			"description": "The timeout used when polling the KafkaConsumer.",
@@ -689,6 +715,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.pollExceptionStrategy": {
+			"name": "camel.component.kafka.pollExceptionStrategy",
+			"description": "To use a custom strategy with the consumer to control how to handle exceptions thrown from the Kafka broker while pooling messages.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.autowiredEnabled": {
 			"name": "camel.component.kafka.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
index f65220a..fcf5581 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
@@ -180,6 +180,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.hostnameVerification": {
+			"name": "camel.sink.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.allowSerializedHeaders": {
 			"name": "camel.sink.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -506,6 +513,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty-http.hostnameVerification": {
+			"name": "camel.component.netty-http.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty-http.allowSerializedHeaders": {
 			"name": "camel.component.netty-http.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
index a0e8a6e..6ac3af1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
@@ -282,6 +282,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.hostnameVerification": {
+			"name": "camel.source.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.allowSerializedHeaders": {
 			"name": "camel.source.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -683,6 +690,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty-http.hostnameVerification": {
+			"name": "camel.component.netty-http.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty-http.allowSerializedHeaders": {
 			"name": "camel.component.netty-http.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
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 04d72ab..7bcdce9 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
@@ -160,6 +160,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.hostnameVerification": {
+			"name": "camel.sink.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.allowSerializedHeaders": {
 			"name": "camel.sink.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -506,6 +513,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty.hostnameVerification": {
+			"name": "camel.component.netty.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty.allowSerializedHeaders": {
 			"name": "camel.component.netty.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
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 6a7e1ba..171e4aa 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
@@ -221,6 +221,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.hostnameVerification": {
+			"name": "camel.source.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.allowSerializedHeaders": {
 			"name": "camel.source.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -630,6 +637,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty.hostnameVerification": {
+			"name": "camel.component.netty.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty.allowSerializedHeaders": {
 			"name": "camel.component.netty.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
index 5b0694f..86ec319 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
@@ -58,7 +58,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -154,30 +154,23 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.headerFilterStrategy": {
-			"name": "camel.sink.endpoint.headerFilterStrategy",
-			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
-			"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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.headerFilterStrategy": {
+			"name": "camel.sink.endpoint.headerFilterStrategy",
+			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -218,6 +211,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.copyHeaders": {
+			"name": "camel.component.resteasy.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.lazyStartProducer": {
 			"name": "camel.component.resteasy.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 [...]
@@ -225,6 +225,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.responsePayloadStreamingThreshold": {
+			"name": "camel.component.resteasy.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipRequestHeaders": {
+			"name": "camel.component.resteasy.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipResponseHeaders": {
+			"name": "camel.component.resteasy.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.allowJavaSerializedObject": {
 			"name": "camel.component.resteasy.allowJavaSerializedObject",
 			"description": "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.",
@@ -232,6 +253,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -239,6 +274,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
index c5f6739..a7d40dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
@@ -113,26 +113,6 @@
 				"InOptionalOut"
 			]
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.headerFilterStrategy": {
-			"name": "camel.source.endpoint.headerFilterStrategy",
-			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
-			"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.",
@@ -154,6 +134,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.headerFilterStrategy": {
+			"name": "camel.source.endpoint.headerFilterStrategy",
+			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.setHttpResponseDuringProcessing": {
 			"name": "camel.source.endpoint.setHttpResponseDuringProcessing",
 			"description": "Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy.",
@@ -211,6 +211,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -218,6 +232,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
index 85ffb87..f6b2d2c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
@@ -132,20 +132,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -167,6 +153,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.servlet.bridgeErrorHandler": {
 			"name": "camel.component.servlet.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
index c1a9e38..7f21500 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.token": {
+			"name": "camel.sink.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.iconEmoji": {
 			"name": "camel.sink.endpoint.iconEmoji",
 			"description": "Use a Slack emoji as an avatar",
@@ -60,6 +66,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
index 4edf1c0..592bcec 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.token": {
+			"name": "camel.source.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -22,6 +28,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.conversationType": {
+			"name": "camel.source.endpoint.conversationType",
+			"description": "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]",
+			"defaultValue": "\"PUBLIC_CHANNEL\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"PUBLIC_CHANNEL",
+				"PRIVATE_CHANNEL",
+				"MPIM",
+				"IM"
+			]
+		},
 		"camel.source.endpoint.maxResults": {
 			"name": "camel.source.endpoint.maxResults",
 			"description": "The Max Result for the poll",
@@ -29,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.naturalOrder": {
+			"name": "camel.source.endpoint.naturalOrder",
+			"description": "Create exchanges in natural order (oldest to newest) or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
 			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
 			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
@@ -43,12 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.token": {
-			"name": "camel.source.endpoint.token",
-			"description": "The token to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -196,6 +216,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
index 62009a2..58811e0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
@@ -245,7 +245,7 @@
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -572,7 +572,7 @@
 		"camel.component.smpp.enquireLinkTimer": {
 			"name": "camel.component.smpp.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
index 421d6c9..6c65033 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
@@ -95,7 +95,7 @@
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -255,7 +255,7 @@
 		"camel.component.smpp.enquireLinkTimer": {
 			"name": "camel.component.smpp.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
index 60fe602..8fc351d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
@@ -245,7 +245,7 @@
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -572,7 +572,7 @@
 		"camel.component.smpps.enquireLinkTimer": {
 			"name": "camel.component.smpps.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
index 1c66806..a139ac5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
@@ -95,7 +95,7 @@
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -255,7 +255,7 @@
 		"camel.component.smpps.enquireLinkTimer": {
 			"name": "camel.component.smpps.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
index ea74960..f8c5ec6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
@@ -93,6 +93,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.tcpReceiverLocalPort": {
+			"name": "camel.sink.endpoint.tcpReceiverLocalPort",
+			"description": "Splunk tcp receiver port defined locally on splunk server. (For example if splunk port 9997 is mapped to 12345, tcpReceiverLocalPort has to be 9997)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.tcpReceiverPort": {
 			"name": "camel.sink.endpoint.tcpReceiverPort",
 			"description": "Splunk tcp receiver port",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json
index b3b495c..955b8fd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json
@@ -106,6 +106,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.allowNullBody": {
+			"name": "camel.component.spring-rabbitmq.allowNullBody",
+			"description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.lazyStartProducer": {
 			"name": "camel.component.spring-rabbitmq.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 [...]
@@ -113,6 +120,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.replyTimeout": {
+			"name": "camel.component.spring-rabbitmq.replyTimeout",
+			"description": "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request\/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout.",
+			"defaultValue": "5000L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.autowiredEnabled": {
 			"name": "camel.component.spring-rabbitmq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json
index 928e594..901ae4f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json
@@ -131,6 +131,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.maximumRetryAttempts": {
+			"name": "camel.source.endpoint.maximumRetryAttempts",
+			"description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message",
+			"defaultValue": "5",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.noLocal": {
 			"name": "camel.source.endpoint.noLocal",
 			"description": "Set to true for an no-local consumer",
@@ -144,6 +151,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.rejectAndDontRequeue": {
+			"name": "camel.source.endpoint.rejectAndDontRequeue",
+			"description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.retryDelay": {
+			"name": "camel.source.endpoint.retryDelay",
+			"description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process",
+			"defaultValue": "1000",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.concurrentConsumers": {
+			"name": "camel.source.endpoint.concurrentConsumers",
+			"description": "The number of consumers",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -161,6 +188,35 @@
 				"InOptionalOut"
 			]
 		},
+		"camel.source.endpoint.maxConcurrentConsumers": {
+			"name": "camel.source.endpoint.maxConcurrentConsumers",
+			"description": "The maximum number of consumers (available only with SMLC)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.messageListenerContainerType": {
+			"name": "camel.source.endpoint.messageListenerContainerType",
+			"description": "The type of the MessageListenerContainer One of: [DMLC] [SMLC]",
+			"defaultValue": "\"DMLC\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DMLC",
+				"SMLC"
+			]
+		},
+		"camel.source.endpoint.prefetchCount": {
+			"name": "camel.source.endpoint.prefetchCount",
+			"description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.retry": {
+			"name": "camel.source.endpoint.retry",
+			"description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.args": {
 			"name": "camel.source.endpoint.args",
 			"description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000",
@@ -257,6 +313,34 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.maximumRetryAttempts": {
+			"name": "camel.component.spring-rabbitmq.maximumRetryAttempts",
+			"description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message",
+			"defaultValue": "5",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.rejectAndDontRequeue": {
+			"name": "camel.component.spring-rabbitmq.rejectAndDontRequeue",
+			"description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.retryDelay": {
+			"name": "camel.component.spring-rabbitmq.retryDelay",
+			"description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process",
+			"defaultValue": "1000",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.concurrentConsumers": {
+			"name": "camel.component.spring-rabbitmq.concurrentConsumers",
+			"description": "The number of consumers",
+			"defaultValue": "1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.errorHandler": {
 			"name": "camel.component.spring-rabbitmq.errorHandler",
 			"description": "To use a custom ErrorHandler for handling exceptions from the message listener (consumer)",
@@ -269,6 +353,23 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.maxConcurrentConsumers": {
+			"name": "camel.component.spring-rabbitmq.maxConcurrentConsumers",
+			"description": "The maximum number of consumers (available only with SMLC)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.messageListenerContainerType": {
+			"name": "camel.component.spring-rabbitmq.messageListenerContainerType",
+			"description": "The type of the MessageListenerContainer One of: [DMLC] [SMLC]",
+			"defaultValue": "\"DMLC\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DMLC",
+				"SMLC"
+			]
+		},
 		"camel.component.spring-rabbitmq.prefetchCount": {
 			"name": "camel.component.spring-rabbitmq.prefetchCount",
 			"description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput.",
@@ -276,6 +377,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.retry": {
+			"name": "camel.component.spring-rabbitmq.retry",
+			"description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.shutdownTimeout": {
 			"name": "camel.component.spring-rabbitmq.shutdownTimeout",
 			"description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
index 82b8287..b89d20e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
@@ -68,6 +68,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.responsePayloadAsByteArray": {
+			"name": "camel.sink.endpoint.responsePayloadAsByteArray",
+			"description": "Whether the response body should be byte or as io.vertx.core.buffer.Buffer",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.sessionManagement": {
 			"name": "camel.sink.endpoint.sessionManagement",
 			"description": "Enables session management via WebClientSession. By default the client is configured to use an in-memory CookieStore. The cookieStore option can be used to override this",
@@ -181,6 +188,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-http.responsePayloadAsByteArray": {
+			"name": "camel.component.vertx-http.responsePayloadAsByteArray",
+			"description": "Whether the response body should be byte or as io.vertx.core.buffer.Buffer",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-http.allowJavaSerializedObject": {
 			"name": "camel.component.vertx-http.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request has the Content-Type application\/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-kafka-source.json
index bc3d44b..70dba68 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-kafka-source.json
@@ -172,6 +172,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.allowManualCommit": {
+			"name": "camel.source.endpoint.allowManualCommit",
+			"description": "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to disable the Kafka Consumer default  [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.autoCommitIntervalMs": {
 			"name": "camel.source.endpoint.autoCommitIntervalMs",
 			"description": "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.",
@@ -755,6 +762,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-kafka.allowManualCommit": {
+			"name": "camel.component.vertx-kafka.allowManualCommit",
+			"description": "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to disable the Kafka Consumer default  [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-kafka.autoCommitIntervalMs": {
 			"name": "camel.component.vertx-kafka.autoCommitIntervalMs",
 			"description": "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.",
@@ -931,6 +945,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-kafka.kafkaManualCommitFactory": {
+			"name": "camel.component.vertx-kafka.kafkaManualCommitFactory",
+			"description": "Factory to use for creating org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances. This allows to plugin a custom factory to create custom org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-kafka.autowiredEnabled": {
 			"name": "camel.component.vertx-kafka.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
index 28b67ce..870144b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -33,30 +33,7 @@ camel-atomix-value-source
 camel-atomix-value-sink
 camel-avro-source
 camel-avro-sink
-camel-aws-cw-sink
-camel-aws-ddb-sink
-camel-aws-ddbstream-source
-camel-aws-ec2-sink
-camel-aws-ecs-sink
-camel-aws-eks-sink
-camel-aws-iam-sink
-camel-aws-kinesis-firehose-sink
-camel-aws-kinesis-source
-camel-aws-kinesis-sink
-camel-aws-kms-sink
-camel-aws-lambda-sink
-camel-aws-mq-sink
-camel-aws-msk-sink
-camel-aws-s3-source
-camel-aws-s3-sink
-camel-aws-sdb-sink
-camel-aws-ses-sink
-camel-aws-sns-sink
-camel-aws-sqs-source
-camel-aws-sqs-sink
-camel-aws-swf-source
-camel-aws-swf-sink
-camel-aws-translate-sink
+camel-aws-secrets-manager-sink
 camel-aws2-athena-sink
 camel-aws2-cw-sink
 camel-aws2-ddb-sink
@@ -81,12 +58,8 @@ camel-aws2-sqs-source
 camel-aws2-sqs-sink
 camel-aws2-sts-sink
 camel-aws2-translate-sink
-camel-azure-blob-source
-camel-azure-blob-sink
 camel-azure-eventhubs-source
 camel-azure-eventhubs-sink
-camel-azure-queue-source
-camel-azure-queue-sink
 camel-azure-storage-blob-source
 camel-azure-storage-blob-sink
 camel-azure-storage-datalake-source
@@ -193,6 +166,7 @@ camel-google-calendar-sink
 camel-google-calendar-stream-source
 camel-google-drive-source
 camel-google-drive-sink
+camel-google-functions-sink
 camel-google-mail-source
 camel-google-mail-sink
 camel-google-mail-stream-source
@@ -201,6 +175,8 @@ camel-google-pubsub-sink
 camel-google-sheets-source
 camel-google-sheets-sink
 camel-google-sheets-stream-source
+camel-google-storage-source
+camel-google-storage-sink
 camel-gora-source
 camel-gora-sink
 camel-grape-sink
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 114e311..15a34ea 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -77,7 +77,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());
-        assertEquals("false", model.getOptions().get(2).getDefaultValue());
+        assertEquals("true", model.getOptions().get(2).getDefaultValue());
         assertNull(model.getOptions().get(1).getDefaultValue());
         assertNull(model.getConverters());
         assertNull(model.getTransforms());
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 d2cb75a..d8b4b95 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,27 +76,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.atmosphere-websocket.lazyStartProducer": {
 			"name": "camel.component.atmosphere-websocket.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/connectors/camel-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 721d7e1..0c42ec2 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
@@ -146,20 +146,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -181,6 +167,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.atmosphere-websocket.bridgeErrorHandler": {
 			"name": "camel.component.atmosphere-websocket.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-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 206aa49..f6dd6c8 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket sink connector supports 19 options, which are listed below.
+The camel-atmosphere-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -41,9 +41,6 @@ The camel-atmosphere-websocket sink connector supports 19 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.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.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.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
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 f9f173d..247aaca 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
@@ -51,11 +51,11 @@ The camel-atmosphere-websocket source connector supports 35 options, which are l
 | *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.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.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
+| *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.component.atmosphere-websocket.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.atmosphere-websocket.servletName* | Default name of servlet to use. The default name is CamelServlet. | "CamelServlet" | false | MEDIUM
 | *camel.component.atmosphere-websocket.attachment MultipartBinding* | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | false | 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 445ef91..f1fdf23 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,15 +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_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;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF = "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC = "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.";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.sink.endpoint.mapHttpMessageHeaders";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atmosphere-websocket.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_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. B [...]
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -107,9 +98,6 @@ 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_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_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_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_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 d2ab69d..9e61e1b 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
@@ -86,12 +86,6 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_CONF = "camel.source.endpoint.fileNameExtWhitelist";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DOC = "Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml.";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
-    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
-    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_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;
@@ -101,6 +95,12 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.source.endpoint.mapHttpMessageHeaders";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
+    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
+    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_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atmosphere-websocket.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_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  [...]
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
@@ -165,11 +165,11 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_EXCHANGE_PATTERN_DOC);
         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_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);
+        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_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_SERVLET_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_SERVLET_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_SERVLET_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_DOC);
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 e52bdd2..6862b65 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
@@ -34,6 +34,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -82,6 +89,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.value": {
 			"name": "camel.sink.endpoint.value",
 			"description": "The metric value",
@@ -125,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.overrideEndpoint": {
+			"name": "camel.component.aws2-cw.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.proxyHost": {
 			"name": "camel.component.aws2-cw.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.uriEndpointOverride": {
+			"name": "camel.component.aws2-cw.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.value": {
 			"name": "camel.component.aws2-cw.value",
 			"description": "The metric value",
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 63140b0..d99283c 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 29 options, which are listed below.
+The camel-aws2-cw sink connector supports 33 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | 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.name* | The metric name | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -42,6 +43,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | 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.unit* | The metric unit | null | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | 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,6 +51,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *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
+| *camel.component.aws2-cw.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-cw.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -56,6 +59,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
 | *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
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 99fb9c1..7f9efef 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
@@ -36,6 +36,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_CONF = "camel.sink.endpoint.name";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DOC = "The metric name";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -57,6 +60,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_CONF = "camel.sink.endpoint.unit";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DOC = "The metric unit";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     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;
@@ -78,6 +84,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_CONF = "camel.component.aws2-cw.name";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_DOC = "The metric name";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-cw.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-cw.proxyHost";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -99,6 +108,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_CONF = "camel.component.aws2-cw.unit";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DOC = "The metric unit";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-cw.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     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;
@@ -128,6 +140,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         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_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_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_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);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -135,6 +148,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_DOC);
         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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DOC);
@@ -142,6 +156,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         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);
+        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_DOC);
@@ -149,6 +164,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_DOC);
         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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_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_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.PASSWORD, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC);
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 ee6819a..4b9f96b 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
@@ -66,6 +66,13 @@
 				"UpdateTable"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -108,6 +115,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.writeCapacity": {
 			"name": "camel.sink.endpoint.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
@@ -183,6 +196,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.component.aws2-ddb.overrideEndpoint": {
+			"name": "camel.component.aws2-ddb.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.proxyHost": {
 			"name": "camel.component.aws2-ddb.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -225,6 +245,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddb.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddb.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.writeCapacity": {
 			"name": "camel.component.aws2-ddb.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
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 d29ab1e..e618515 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 33 options, which are listed below.
+The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 
 
 
@@ -38,12 +38,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | 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.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | The region in which DynamoDB 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.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -54,12 +56,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-ddb.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
 | *camel.component.aws2-ddb.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ddb.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.component.aws2-ddb.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddb.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyPort* | The region in which DynamoDB client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | 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.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
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 cf3927b..dba4635 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
@@ -45,6 +45,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DEFAULT = "PutItem";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -63,6 +66,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     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;
@@ -93,6 +99,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_CONF = "camel.component.aws2-ddb.operation";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DEFAULT = "PutItem";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ddb.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ddb.proxyHost";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -111,6 +120,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ddb.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ddb.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     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;
@@ -143,12 +155,14 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         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);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_DOC);
         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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DOC);
@@ -159,12 +173,14 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_DOC);
         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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_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_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.PASSWORD, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC);
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 055f135..11afb82 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
@@ -48,6 +48,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.proxyHost": {
 			"name": "camel.source.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -97,6 +104,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -281,6 +294,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.overrideEndpoint": {
+			"name": "camel.component.aws2-ddbstream.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.proxyHost": {
 			"name": "camel.component.aws2-ddbstream.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -323,6 +343,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddbstream.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"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.",
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 0f29b14..0f57a52 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 45 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *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
 | *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,6 +44,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.sequenceNumberProvider* | 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.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.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
@@ -67,12 +69,14 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.component.aws2-ddbstream.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.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
 | *camel.component.aws2-ddbstream.maxResultsPer Request* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.component.aws2-ddbstream.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ddbstream.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddbstream.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
index 955d441..cf499ef 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
@@ -41,6 +41,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF = "camel.source.endpoint.maxResultsPerRequest";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
     public static final Integer CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.source.endpoint.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_CONF = "camel.source.endpoint.proxyHost";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -62,6 +65,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.source.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -134,6 +140,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF = "camel.component.aws2-ddbstream.maxResultsPerRequest";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
     public static final Integer CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ddbstream.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ddbstream.proxyHost";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -152,6 +161,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ddbstream.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ddbstream.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ddbstream.autowiredEnabled";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_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_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -180,6 +192,7 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -187,6 +200,7 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC);
@@ -211,12 +225,14 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json b/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
index 5407786..74926ea 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
@@ -53,6 +53,13 @@
 				"deleteTags"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -102,6 +109,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -146,6 +159,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.component.aws2-ec2.overrideEndpoint": {
+			"name": "camel.component.aws2-ec2.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.pojoRequest": {
 			"name": "camel.component.aws2-ec2.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ec2.uriEndpointOverride": {
+			"name": "camel.component.aws2-ec2.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.autowiredEnabled": {
 			"name": "camel.component.aws2-ec2.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc b/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
index b9790a3..3097f40 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ec2.CamelAws2ec2SinkConnecto
 ----
 
 
-The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws2-ec2 sink connector supports 29 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | 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.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | null [...]
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which EC2 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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | null | false | MEDIUM
 | *camel.component.aws2-ec2.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ec2.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | [...]
+| *camel.component.aws2-ec2.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ec2.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ec2.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.component.aws2-ec2.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -55,6 +58,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ec2.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java b/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
index 47b368b..c6d4ecd 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
@@ -39,6 +39,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorIns [...]
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -60,6 +63,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-ec2.accessKey";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -75,6 +81,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_CONF = "camel.component.aws2-ec2.operation";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorIn [...]
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ec2.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-ec2.pojoRequest";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -96,6 +105,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ec2.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ec2.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ec2.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EC2_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_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -117,6 +129,7 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_DOC);
@@ -124,11 +137,13 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_DOC);
@@ -136,6 +151,7 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json b/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
index 60749a6..7003584 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-ecs.overrideEndpoint": {
+			"name": "camel.component.aws2-ecs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.pojoRequest": {
 			"name": "camel.component.aws2-ecs.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ecs.uriEndpointOverride": {
+			"name": "camel.component.aws2-ecs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.autowiredEnabled": {
 			"name": "camel.component.aws2-ecs.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc b/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
index 092f7f7..ba4361a 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ecs.CamelAws2ecsSinkConnecto
 ----
 
 
-The camel-aws2-ecs sink connector supports 25 options, which are listed below.
+The camel-aws2-ecs sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.ecsClient* | To use a existing configured AWS ECS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-ecs.ecsClient* | To use a existing configured AWS ECS as client | null | false | MEDIUM
 | *camel.component.aws2-ecs.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ecs.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-ecs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ecs.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ecs.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ecs.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.aws2-ecs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ecs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java b/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
index b42a42f..9d05e17 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_CONF = "camel.component.aws2-ecs.operation";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ecs.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-ecs.pojoRequest";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ecs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ecs.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ecs.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2ECS_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_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json b/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
index 903214c..6815882 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
+++ b/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-eks.overrideEndpoint": {
+			"name": "camel.component.aws2-eks.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.pojoRequest": {
 			"name": "camel.component.aws2-eks.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eks.uriEndpointOverride": {
+			"name": "camel.component.aws2-eks.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.autowiredEnabled": {
 			"name": "camel.component.aws2-eks.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc b/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
index d20c169..e83fbaa 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eks.CamelAws2eksSinkConnecto
 ----
 
 
-The camel-aws2-eks sink connector supports 25 options, which are listed below.
+The camel-aws2-eks sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.eksClient* | To use a existing configured AWS EKS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eks.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-eks.eksClient* | To use a existing configured AWS EKS as client | null | false | MEDIUM
 | *camel.component.aws2-eks.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-eks.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-eks.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eks.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eks.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eks.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-eks.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eks.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java b/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
index b14fb6d..5fa9fd4 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
+++ b/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_CONF = "camel.component.aws2-eks.operation";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-eks.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-eks.pojoRequest";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-eks.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-eks.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-eks.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EKS_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_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json b/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
index dbe8f00..31dc703 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
@@ -53,6 +53,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -96,6 +103,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -152,6 +165,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.component.aws2-eventbridge.overrideEndpoint": {
+			"name": "camel.component.aws2-eventbridge.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.pojoRequest": {
 			"name": "camel.component.aws2-eventbridge.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eventbridge.uriEndpointOverride": {
+			"name": "camel.component.aws2-eventbridge.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.autowiredEnabled": {
 			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
index bf448fd..95f58f0 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 27 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
@@ -36,12 +36,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | 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.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Eventbridge client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | false | MEDIUM
@@ -49,12 +51,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.component.aws2-eventbridge.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eventbridge.region* | The region in which Eventbridge client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eventbridge.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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-eventbridge.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
index 407029e..edac021 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
@@ -41,6 +41,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DEFAULT = "putRule";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -59,6 +62,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -80,6 +86,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_CONF = "camel.component.aws2-eventbridge.operation";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DEFAULT = "putRule";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-eventbridge.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-eventbridge.pojoRequest";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -98,6 +107,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-eventbridge.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-eventbridge.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-eventbridge.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_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_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -126,12 +138,14 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_DOC);
@@ -139,12 +153,14 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json b/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
index bf4a377..ef28770 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
+++ b/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
@@ -49,6 +49,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -93,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -145,6 +158,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.component.aws2-iam.overrideEndpoint": {
+			"name": "camel.component.aws2-iam.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.pojoRequest": {
 			"name": "camel.component.aws2-iam.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -189,6 +209,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-iam.uriEndpointOverride": {
+			"name": "camel.component.aws2-iam.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.autowiredEnabled": {
 			"name": "camel.component.aws2-iam.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
index d78702a..aa83541 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnecto
 ----
 
 
-The camel-aws2-iam sink connector supports 25 options, which are listed below.
+The camel-aws2-iam sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.iamClient* | To use a existing configured AWS IAM as client | 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.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | "aws-global" | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-iam.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-iam.iamClient* | To use a existing configured AWS IAM as client | null | false | MEDIUM
 | *camel.component.aws2-iam.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-iam.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.component.aws2-iam.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-iam.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-iam.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-iam.region* | The region in which IAM 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() | "aws-global" | false | MEDIUM
 | *camel.component.aws2-iam.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-iam.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
index 2aa05ee..659762a 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DOC = "The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_CONF = "camel.component.aws2-iam.operation";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DOC = "The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-iam.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-iam.pojoRequest";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-iam.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-iam.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-iam.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2IAM_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_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json b/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
index 6bda133..972405c 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
+++ b/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
@@ -42,6 +42,13 @@
 				"enableKey"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"enableKey"
 			]
 		},
+		"camel.component.aws2-kms.overrideEndpoint": {
+			"name": "camel.component.aws2-kms.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.pojoRequest": {
 			"name": "camel.component.aws2-kms.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-kms.uriEndpointOverride": {
+			"name": "camel.component.aws2-kms.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.autowiredEnabled": {
 			"name": "camel.component.aws2-kms.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
index 1460f0b..7ecc13d 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2kms.CamelAws2kmsSinkConnecto
 ----
 
 
-The camel-aws2-kms sink connector supports 25 options, which are listed below.
+The camel-aws2-kms sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.kmsClient* | To use a existing configured AWS KMS as client | 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.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *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 EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-kms.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-kms.kmsClient* | To use a existing configured AWS KMS as client | null | false | MEDIUM
 | *camel.component.aws2-kms.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-kms.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.component.aws2-kms.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-kms.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-kms.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-kms.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-kms.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-kms.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
index f63295d..613f380 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey]";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_CONF = "camel.component.aws2-kms.operation";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey]";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-kms.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-kms.pojoRequest";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-kms.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-kms.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-kms.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2KMS_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_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
index 40b5cac..9f3f3b0 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
@@ -49,6 +49,13 @@
 				"listVersions"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -69,6 +76,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.awsLambdaClient": {
 			"name": "camel.sink.endpoint.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
@@ -150,6 +163,13 @@
 				"listVersions"
 			]
 		},
+		"camel.component.aws2-lambda.overrideEndpoint": {
+			"name": "camel.component.aws2-lambda.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.pojoRequest": {
 			"name": "camel.component.aws2-lambda.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -170,6 +190,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.uriEndpointOverride": {
+			"name": "camel.component.aws2-lambda.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.autowiredEnabled": {
 			"name": "camel.component.aws2-lambda.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc b/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
index a6bdc39..703ff97 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2lambda.CamelAws2lambdaSinkCo
 ----
 
 
-The camel-aws2-lambda sink connector supports 25 options, which are listed below.
+The camel-aws2-lambda sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,9 +34,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.sink.path.function* | Name of the Lambda function. | null | true | HIGH
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.operation* | The operation to 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | 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
@@ -46,9 +48,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.component.aws2-lambda.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-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  [...]
 | *camel.component.aws2-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" | fal [...]
+| *camel.component.aws2-lambda.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-lambda.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-lambda.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.aws2-lambda.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-lambda.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.component.aws2-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java b/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
index a380a7a..1e29d1a 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
@@ -35,6 +35,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DOC = "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] [lis [...]
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DEFAULT = "invokeFunction";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -44,6 +47,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF = "camel.sink.endpoint.awsLambdaClient";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT = null;
@@ -71,6 +77,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_CONF = "camel.component.aws2-lambda.operation";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DOC = "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] [li [...]
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DEFAULT = "invokeFunction";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-lambda.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-lambda.pojoRequest";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -80,6 +89,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-lambda.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-lambda.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-lambda.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2LAMBDA_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_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -117,9 +129,11 @@ public class CamelAws2lambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_DOC);
@@ -129,9 +143,11 @@ public class CamelAws2lambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json b/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
index c4a0c68..b3726e5 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
+++ b/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
@@ -42,6 +42,13 @@
 				"describeBroker"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.component.aws2-mq.overrideEndpoint": {
+			"name": "camel.component.aws2-mq.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.pojoRequest": {
 			"name": "camel.component.aws2-mq.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-mq.uriEndpointOverride": {
+			"name": "camel.component.aws2-mq.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.autowiredEnabled": {
 			"name": "camel.component.aws2-mq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc b/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
index e565b89..62e1ef9 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2mq.CamelAws2mqSinkConnector
 ----
 
 
-The camel-aws2-mq sink connector supports 25 options, which are listed below.
+The camel-aws2-mq sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonMqClient* | To use a existing configured AmazonMQClient as client | 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.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-mq.amazonMqClient* | To use a existing configured AmazonMQClient as client | null | false | MEDIUM
 | *camel.component.aws2-mq.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-mq.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-mq.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.component.aws2-mq.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-mq.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-mq.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-mq.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-mq.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-mq.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java b/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
index 2da17a1..7e58623 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
+++ b/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker]";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_CONF = "camel.component.aws2-mq.operation";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DOC = "The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker]";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-mq.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-mq.pojoRequest";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-mq.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-mq.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-mq.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2MQ_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_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json b/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
index b12150a..8ea8509 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
+++ b/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
@@ -40,6 +40,13 @@
 				"describeCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.component.aws2-msk.overrideEndpoint": {
+			"name": "camel.component.aws2-msk.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.pojoRequest": {
 			"name": "camel.component.aws2-msk.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-msk.uriEndpointOverride": {
+			"name": "camel.component.aws2-msk.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.autowiredEnabled": {
 			"name": "camel.component.aws2-msk.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc b/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
index f993f6b..b17dc71 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2msk.CamelAws2mskSinkConnecto
 ----
 
 
-The camel-aws2-msk sink connector supports 25 options, which are listed below.
+The camel-aws2-msk sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-msk 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.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-msk.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-msk.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-msk.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.component.aws2-msk.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.component.aws2-msk.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-msk.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-msk.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-msk.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-msk.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-msk.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java b/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
index 12c8863..53bd543 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
+++ b/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster]";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_CONF = "camel.component.aws2-msk.operation";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster]";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-msk.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-msk.pojoRequest";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-msk.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-msk.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-msk.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2MSK_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_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
index 9e183fa..e5674e6 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
@@ -30,7 +30,7 @@
 		"camel.sink.endpoint.autoCreateBucket": {
 			"name": "camel.sink.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -223,7 +223,7 @@
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
index 8621e81..d1169e8 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
@@ -30,7 +30,7 @@
 		"camel.source.endpoint.autoCreateBucket": {
 			"name": "camel.source.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -386,7 +386,7 @@
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
index 597aa87..1a99602 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
@@ -34,7 +34,7 @@ The camel-aws2-s3 sink connector supports 59 options, which are listed below.
 | *camel.sink.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.sink.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | null | false | MEDIUM
@@ -62,7 +62,7 @@ The camel-aws2-s3 sink connector supports 59 options, which are listed below.
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-s3.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
index 909c149..81fb275 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
@@ -34,7 +34,7 @@ The camel-aws2-s3 source connector supports 85 options, which are listed below.
 | *camel.source.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.source.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.source.endpoint.policy* | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | null | false | MEDIUM
@@ -85,7 +85,7 @@ The camel-aws2-s3 source connector supports 85 options, which are listed below.
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-s3.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
index 86815fd..587fe04 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
@@ -35,7 +35,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.sink.endpoint.autoCreateBucket";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
-    public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
     public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
@@ -119,7 +119,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.aws2-s3.autoCreateBucket";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
-    public static final Boolean CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-s3.configuration";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_DEFAULT = null;
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
index 5b1608a..6c4edc9 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
@@ -37,7 +37,7 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.source.endpoint.autoCreateBucket";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
-    public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.source.endpoint.overrideEndpoint";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
     public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
@@ -190,7 +190,7 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.aws2-s3.autoCreateBucket";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
-    public static final Boolean CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final Boolean CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-s3.configuration";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_DEFAULT = null;
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
index e213542..cf18cf1 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
+++ b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
@@ -28,6 +28,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -88,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -119,6 +132,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.overrideEndpoint": {
+			"name": "camel.component.aws2-ses.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.proxyHost": {
 			"name": "camel.component.aws2-ses.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -179,6 +199,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.uriEndpointOverride": {
+			"name": "camel.component.aws2-ses.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.autowiredEnabled": {
 			"name": "camel.component.aws2-ses.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc b/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
index 2ccc490..434ab72 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ses.CamelAws2sesSinkConnecto
 ----
 
 
-The camel-aws2-ses sink connector supports 29 options, which are listed below.
+The camel-aws2-ses sink connector supports 33 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.path.from* | The sender's email address. | null | true | HIGH
 | *camel.sink.endpoint.amazonSESClient* | To use the AmazonSimpleEmailService as the client | 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ses.amazonSESClient* | To use the AmazonSimpleEmailService as the client | null | false | MEDIUM
 | *camel.component.aws2-ses.configuration* | component configuration | null | false | MEDIUM
 | *camel.component.aws2-ses.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
+| *camel.component.aws2-ses.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ses.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -57,6 +60,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
 | *camel.component.aws2-ses.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ses.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java b/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
index 2720596..6db8397 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
@@ -33,6 +33,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2SES_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 wh [...]
     public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the SES client";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -60,6 +63,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -75,6 +81,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws2-ses.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2SES_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 w [...]
     public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ses.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ses.proxyHost";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the SES client";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -102,6 +111,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ses.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ses.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ses.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2SES_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_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -127,6 +139,7 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_PATH_FROM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_PATH_FROM_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2SES_PATH_FROM_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -136,11 +149,13 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_TO_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_DOC);
@@ -150,6 +165,7 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_TO_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
index 123aec7..0ef5538 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
+++ b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
@@ -24,7 +24,7 @@
 		"camel.sink.endpoint.autoCreateTopic": {
 			"name": "camel.sink.endpoint.autoCreateTopic",
 			"description": "Setting the autocreation of the topic",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -75,6 +75,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.policy": {
 			"name": "camel.sink.endpoint.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -143,6 +150,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -171,7 +184,7 @@
 		"camel.component.aws2-sns.autoCreateTopic": {
 			"name": "camel.component.aws2-sns.autoCreateTopic",
 			"description": "Setting the autocreation of the topic",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -222,6 +235,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.overrideEndpoint": {
+			"name": "camel.component.aws2-sns.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.policy": {
 			"name": "camel.component.aws2-sns.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -290,6 +310,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.uriEndpointOverride": {
+			"name": "camel.component.aws2-sns.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
index 6d99dd6..f36dc00 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnecto
 ----
 
 
-The camel-aws2-sns sink connector supports 44 options, which are listed below.
+The camel-aws2-sns sink connector supports 48 options, which are listed below.
 
 
 
@@ -33,13 +33,14 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.topicNameOrArn* | Topic name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonSNSClient* | To use the AmazonSNS as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateTopic* | Setting the autocreation of the topic | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateTopic* | Setting the autocreation of the topic | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO Topic. 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 Topic. 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.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -50,17 +51,19 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sns.amazonSNSClient* | To use the AmazonSNS as the client | null | false | MEDIUM
-| *camel.component.aws2-sns.autoCreateTopic* | Setting the autocreation of the topic | true | false | MEDIUM
+| *camel.component.aws2-sns.autoCreateTopic* | Setting the autocreation of the topic | false | false | MEDIUM
 | *camel.component.aws2-sns.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-sns.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. | null | false | MEDIUM
 | *camel.component.aws2-sns.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sns.messageDeduplicationId Strategy* | Only for FIFO Topic. 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.aws2-sns.messageGroupIdStrategy* | Only for FIFO Topic. 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.aws2-sns.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.component.aws2-sns.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -71,6 +74,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sns.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
index 5c3b68b..321de5b 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
@@ -32,7 +32,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_AMAZON_SNSCLIENT_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_AUTO_CREATE_TOPIC_CONF = "camel.sink.endpoint.autoCreateTopic";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_AUTO_CREATE_TOPIC_DOC = "Setting the autocreation of the topic";
-    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_AUTO_CREATE_TOPIC_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_AUTO_CREATE_TOPIC_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.sink.endpoint.headerFilterStrategy";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to map headers to/from Camel.";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -51,6 +51,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_CONF = "camel.sink.endpoint.messageStructure";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DOC = "The message structure to use such as json";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_CONF = "camel.sink.endpoint.policy";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DOC = "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DEFAULT = null;
@@ -81,6 +84,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -95,7 +101,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_AMAZON_SNSCLIENT_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_AUTO_CREATE_TOPIC_CONF = "camel.component.aws2-sns.autoCreateTopic";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_AUTO_CREATE_TOPIC_DOC = "Setting the autocreation of the topic";
-    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_AUTO_CREATE_TOPIC_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_AUTO_CREATE_TOPIC_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-sns.configuration";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_CONFIGURATION_DOC = "Component configuration";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -114,6 +120,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_CONF = "camel.component.aws2-sns.messageStructure";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DOC = "The message structure to use such as json";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sns.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_CONF = "camel.component.aws2-sns.policy";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DOC = "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DEFAULT = null;
@@ -144,6 +153,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sns.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sns.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sns.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -178,6 +190,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_DOC);
@@ -188,6 +201,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DOC);
@@ -199,6 +213,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_DOC);
@@ -209,6 +224,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
index 6f06f26..8272ee5 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
@@ -31,7 +31,7 @@
 		"camel.sink.endpoint.autoCreateQueue": {
 			"name": "camel.sink.endpoint.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -41,6 +41,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.protocol": {
 			"name": "camel.sink.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -85,6 +98,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.batchSeparator": {
+			"name": "camel.sink.endpoint.batchSeparator",
+			"description": "Set the separator when passing a String to send batch message operation",
+			"defaultValue": "\",\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -215,7 +235,7 @@
 		"camel.component.aws2-sqs.autoCreateQueue": {
 			"name": "camel.component.aws2-sqs.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -225,6 +245,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -262,6 +289,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -269,6 +302,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.batchSeparator": {
+			"name": "camel.component.aws2-sqs.batchSeparator",
+			"description": "Set the separator when passing a String to send batch message operation",
+			"defaultValue": "\",\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
index 5f56d2f..0dc497c 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
@@ -31,7 +31,7 @@
 		"camel.source.endpoint.autoCreateQueue": {
 			"name": "camel.source.endpoint.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -41,6 +41,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.protocol": {
 			"name": "camel.source.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -120,7 +133,7 @@
 		},
 		"camel.source.endpoint.deleteIfFiltered": {
 			"name": "camel.source.endpoint.deleteIfFiltered",
-			"description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.",
+			"description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -398,7 +411,7 @@
 		"camel.component.aws2-sqs.autoCreateQueue": {
 			"name": "camel.component.aws2-sqs.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -408,6 +421,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -445,6 +465,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -487,7 +513,7 @@
 		},
 		"camel.component.aws2-sqs.deleteIfFiltered": {
 			"name": "camel.component.aws2-sqs.deleteIfFiltered",
-			"description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.",
+			"description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
index 470c024..80d7a6f 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 54 options, which are listed below.
+The camel-aws2-sqs sink connector supports 60 options, which are listed below.
 
 
 
@@ -34,14 +34,17 @@ The camel-aws2-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.path.queueNameOrArn* | Queue name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.sink.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -60,14 +63,17 @@ The camel-aws2-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sqs.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
index 4b3169a..1f125b6 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 89 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -34,20 +34,22 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.path.queueNameOrArn* | Queue name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.source.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.source.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
 | *camel.source.endpoint.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM
 | *camel.source.endpoint.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM
-| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | MEDIUM
+| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM
 | *camel.source.endpoint.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM
 | *camel.source.endpoint.kmsDataKeyReusePeriodSeconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM
 | *camel.source.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM
@@ -87,20 +89,22 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sqs.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
 | *camel.component.aws2-sqs.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM
 | *camel.component.aws2-sqs.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM
-| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | MEDIUM
+| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM
 | *camel.component.aws2-sqs.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM
 | *camel.component.aws2-sqs.kmsDataKeyReusePeriod Seconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM
 | *camel.component.aws2-sqs.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
index 7cf20a2..6c270be 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
@@ -35,10 +35,13 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF = "camel.sink.endpoint.autoCreateQueue";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC = "Setting the autocreation of the queue";
-    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.sink.endpoint.headerFilterStrategy";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to map headers to/from Camel.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_CONF = "camel.sink.endpoint.protocol";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT = "https";
@@ -54,9 +57,15 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_CONF = "camel.sink.endpoint.batchSeparator";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_DOC = "Set the separator when passing a String to send batch message operation";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_DEFAULT = ",";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF = "camel.sink.endpoint.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT = null;
@@ -113,10 +122,13 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF = "camel.component.aws2-sqs.autoCreateQueue";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC = "Setting the autocreation of the queue";
-    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT = true;
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-sqs.configuration";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DOC = "The AWS SQS default configuration";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sqs.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_CONF = "camel.component.aws2-sqs.protocol";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT = "https";
@@ -132,9 +144,15 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sqs.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_CONF = "camel.component.aws2-sqs.batchSeparator";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_DOC = "Set the separator when passing a String to send batch message operation";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_DEFAULT = ",";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF = "camel.component.aws2-sqs.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT = null;
@@ -204,12 +222,15 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
@@ -230,12 +251,15 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
index e47cca1..b2f40dc 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
@@ -37,10 +37,13 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF = "camel.source.endpoint.autoCreateQueue";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC = "Setting the autocreation of the queue";
-    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT = true;
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.source.endpoint.headerFilterStrategy";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to map headers to/from Camel.";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.source.endpoint.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_CONF = "camel.source.endpoint.protocol";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT = "https";
@@ -56,6 +59,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.source.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.source.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -75,7 +81,7 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DOC = "Delete message from SQS after it has been read";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_CONF = "camel.source.endpoint.deleteIfFiltered";
-    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_CONF = "camel.source.endpoint.extendMessageVisibility";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_DOC = "If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs.";
@@ -196,10 +202,13 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF = "camel.component.aws2-sqs.autoCreateQueue";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC = "Setting the autocreation of the queue";
-    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT = true;
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-sqs.configuration";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DOC = "The AWS SQS default configuration";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sqs.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_CONF = "camel.component.aws2-sqs.protocol";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT = "https";
@@ -215,6 +224,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sqs.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -234,7 +246,7 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DOC = "Delete message from SQS after it has been read";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_CONF = "camel.component.aws2-sqs.deleteIfFiltered";
-    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_CONF = "camel.component.aws2-sqs.extendMessageVisibility";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_DOC = "If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs.";
@@ -311,11 +323,13 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -364,11 +378,13 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-sink.json b/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-sink.json
index 95ad11b..2407404 100644
--- a/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-sink.json
+++ b/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-sink.json
@@ -34,6 +34,13 @@
 				"getFederationToken"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -84,6 +91,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -121,6 +134,13 @@
 				"getFederationToken"
 			]
 		},
+		"camel.component.aws2-sts.overrideEndpoint": {
+			"name": "camel.component.aws2-sts.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sts.pojoRequest": {
 			"name": "camel.component.aws2-sts.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -171,6 +191,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sts.uriEndpointOverride": {
+			"name": "camel.component.aws2-sts.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sts.autowiredEnabled": {
 			"name": "camel.component.aws2-sts.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-sts-kafka-connector/src/main/docs/camel-aws2-sts-kafka-sink-connector.adoc b/connectors/camel-aws2-sts-kafka-connector/src/main/docs/camel-aws2-sts-kafka-sink-connector.adoc
index 2702a1c..357feaf 100644
--- a/connectors/camel-aws2-sts-kafka-connector/src/main/docs/camel-aws2-sts-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sts-kafka-connector/src/main/docs/camel-aws2-sts-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sts.CamelAws2stsSinkConnecto
 ----
 
 
-The camel-aws2-sts sink connector supports 25 options, which are listed below.
+The camel-aws2-sts sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
 | *camel.sink.path.label* | Logical name | null | true | HIGH
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.operation* | The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken] | "assumeRole" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the STS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the STS client | null | false | MEDIUM
@@ -41,11 +42,13 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which STS 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() | "aws-global" | false | MEDIUM
 | *camel.sink.endpoint.stsClient* | To use a existing configured AWS STS as client | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sts.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-sts.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sts.operation* | The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken] | "assumeRole" | true | HIGH
+| *camel.component.aws2-sts.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sts.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-sts.proxyHost* | To define a proxy host when instantiating the STS client | null | false | MEDIUM
 | *camel.component.aws2-sts.proxyPort* | To define a proxy port when instantiating the STS client | null | false | MEDIUM
@@ -53,6 +56,7 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
 | *camel.component.aws2-sts.region* | The region in which STS 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() | "aws-global" | false | MEDIUM
 | *camel.component.aws2-sts.stsClient* | To use a existing configured AWS STS as client | null | false | MEDIUM
 | *camel.component.aws2-sts.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sts.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sts.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-sts.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-sts.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-sts-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sts/CamelAws2stsSinkConnectorConfig.java b/connectors/camel-aws2-sts-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sts/CamelAws2stsSinkConnectorConfig.java
index 736c64d..fe10588 100644
--- a/connectors/camel-aws2-sts-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sts/CamelAws2stsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sts-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sts/CamelAws2stsSinkConnectorConfig.java
@@ -33,6 +33,9 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken]";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_DEFAULT = "assumeRole";
+    public static final String CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -69,6 +75,9 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_CONF = "camel.component.aws2-sts.operation";
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken]";
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_DEFAULT = "assumeRole";
+    public static final String CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sts.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-sts.pojoRequest";
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sts.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sts.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2STS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-sts.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2STS_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_AWS2STS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -115,6 +127,7 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2STS_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2STS_PATH_LABEL_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2STS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_PROXY_PORT_DOC);
@@ -122,11 +135,13 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_STS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_STS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_STS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2STS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2STS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2STS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_PROXY_PORT_DOC);
@@ -134,6 +149,7 @@ public class CamelAws2stsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_STS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_STS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_STS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2STS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2STS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2STS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2STS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2STS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-sink.json b/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-sink.json
index 58ea322..2fcd8ce 100644
--- a/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-sink.json
+++ b/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-sink.json
@@ -39,6 +39,13 @@
 				"translateText"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -100,6 +107,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -142,6 +155,13 @@
 				"translateText"
 			]
 		},
+		"camel.component.aws2-translate.overrideEndpoint": {
+			"name": "camel.component.aws2-translate.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-translate.pojoRequest": {
 			"name": "camel.component.aws2-translate.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -203,6 +223,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-translate.uriEndpointOverride": {
+			"name": "camel.component.aws2-translate.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-translate.autowiredEnabled": {
 			"name": "camel.component.aws2-translate.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-translate-kafka-connector/src/main/docs/camel-aws2-translate-kafka-sink-connector.adoc b/connectors/camel-aws2-translate-kafka-connector/src/main/docs/camel-aws2-translate-kafka-sink-connector.adoc
index a3ef3f7..e9a0813 100644
--- a/connectors/camel-aws2-translate-kafka-connector/src/main/docs/camel-aws2-translate-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-translate-kafka-connector/src/main/docs/camel-aws2-translate-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2translate.CamelAws2translate
 ----
 
 
-The camel-aws2-translate sink connector supports 31 options, which are listed below.
+The camel-aws2-translate sink connector supports 35 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The camel-aws2-translate sink connector supports 31 options, which are listed be
 | *camel.sink.endpoint.autodetectSourceLanguage* | Being able to autodetect the source language | 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.operation* | The operation to perform One of: [translateText] | "translateText" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Translate client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Translate client | null | false | MEDIUM
@@ -44,12 +45,14 @@ The camel-aws2-translate sink connector supports 31 options, which are listed be
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-translate.autodetectSource Language* | Being able to autodetect the source language | false | false | MEDIUM
 | *camel.component.aws2-translate.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-translate.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 process [...]
 | *camel.component.aws2-translate.operation* | The operation to perform One of: [translateText] | "translateText" | true | HIGH
+| *camel.component.aws2-translate.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-translate.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-translate.proxyHost* | To define a proxy host when instantiating the Translate client | null | false | MEDIUM
 | *camel.component.aws2-translate.proxyPort* | To define a proxy port when instantiating the Translate client | null | false | MEDIUM
@@ -59,6 +62,7 @@ The camel-aws2-translate sink connector supports 31 options, which are listed be
 | *camel.component.aws2-translate.targetLanguage* | Target language to use | null | false | MEDIUM
 | *camel.component.aws2-translate.translateClient* | To use a existing configured AWS Translate as client | null | false | MEDIUM
 | *camel.component.aws2-translate.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-translate.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-translate.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-translate.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2translate/CamelAws2translateSinkConnectorConfig.java b/connectors/camel-aws2-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2translate/CamelAws2translateSinkConnectorConfig.java
index 13bdf04..a1ed9d3 100644
--- a/connectors/camel-aws2-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2translate/CamelAws2translateSinkConnectorConfig.java
+++ b/connectors/camel-aws2-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2translate/CamelAws2translateSinkConnectorConfig.java
@@ -38,6 +38,9 @@ public class CamelAws2translateSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [translateText]";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_DEFAULT = "translateText";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -65,6 +68,9 @@ public class CamelAws2translateSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -83,6 +89,9 @@ public class CamelAws2translateSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_CONF = "camel.component.aws2-translate.operation";
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_DOC = "The operation to perform One of: [translateText]";
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_DEFAULT = "translateText";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-translate.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-translate.pojoRequest";
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -110,6 +119,9 @@ public class CamelAws2translateSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-translate.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-translate.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-translate.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2TRANSLATE_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_AWS2TRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -137,6 +149,7 @@ public class CamelAws2translateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_AUTODETECT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_AUTODETECT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_AUTODETECT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_PROXY_PORT_DOC);
@@ -146,12 +159,14 @@ public class CamelAws2translateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTODETECT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTODETECT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTODETECT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_PROXY_PORT_DOC);
@@ -161,6 +176,7 @@ public class CamelAws2translateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRANSLATE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2TRANSLATE_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2TRANSLATE_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
index 70c7307..1a847d0 100644
--- a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
+++ b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
@@ -35,7 +35,7 @@
 		},
 		"camel.sink.endpoint.appendChars": {
 			"name": "camel.sink.endpoint.appendChars",
-			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
+			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc b/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
index c0eafd7..c20fd0b 100644
--- a/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
+++ b/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
@@ -35,7 +35,7 @@ The camel-file sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.charset* | This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to conv [...]
 | *camel.sink.endpoint.doneFileName* | Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Ei [...]
 | *camel.sink.endpoint.fileName* | Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If  [...]
-| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
+| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
 | *camel.sink.endpoint.fileExist* | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. [...]
 | *camel.sink.endpoint.flatten* | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | false | MEDIUM
 | *camel.sink.endpoint.jailStartingDirectory* | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | false | MEDIUM
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
index e391441..d489980 100644
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
+++ b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
@@ -37,7 +37,7 @@ public class CamelFileSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_NAME_DOC = "Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always  [...]
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_NAME_DEFAULT = null;
     public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_CONF = "camel.sink.endpoint.appendChars";
-    public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DOC = "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.";
+    public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DOC = "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.";
     public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DEFAULT = null;
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_EXIST_CONF = "camel.sink.endpoint.fileExist";
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_EXIST_DOC = "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExi [...]
diff --git a/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-sink.json b/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-sink.json
index 088ef5d..7f77c26 100644
--- a/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-sink.json
+++ b/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-sink.json
@@ -82,6 +82,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.freemarker.localizedLookup": {
+			"name": "camel.component.freemarker.localizedLookup",
+			"description": "Enables\/disables localized template lookup. Disabled by default.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.freemarker.autowiredEnabled": {
 			"name": "camel.component.freemarker.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-freemarker-kafka-connector/src/main/docs/camel-freemarker-kafka-sink-connector.adoc b/connectors/camel-freemarker-kafka-connector/src/main/docs/camel-freemarker-kafka-sink-connector.adoc
index f0767da..2c7f391 100644
--- a/connectors/camel-freemarker-kafka-connector/src/main/docs/camel-freemarker-kafka-sink-connector.adoc
+++ b/connectors/camel-freemarker-kafka-connector/src/main/docs/camel-freemarker-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.freemarker.CamelFreemarkerSinkCo
 ----
 
 
-The camel-freemarker sink connector supports 13 options, which are listed below.
+The camel-freemarker sink connector supports 14 options, which are listed below.
 
 
 
@@ -42,6 +42,7 @@ The camel-freemarker sink connector supports 13 options, which are listed below.
 | *camel.component.freemarker.allowContextMapAll* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | false | MEDIUM
 | *camel.component.freemarker.allowTemplateFromHeader* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | false | MEDIUM
 | *camel.component.freemarker.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.freemarker.localizedLookup* | Enables/disables localized template lookup. Disabled by default. | false | false | MEDIUM
 | *camel.component.freemarker.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.freemarker.configuration* | To use an existing freemarker.template.Configuration instance as the configuration. | null | false | MEDIUM
 |===
diff --git a/connectors/camel-freemarker-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/freemarker/CamelFreemarkerSinkConnectorConfig.java b/connectors/camel-freemarker-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/freemarker/CamelFreemarkerSinkConnectorConfig.java
index 5f37778..5f24156 100644
--- a/connectors/camel-freemarker-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/freemarker/CamelFreemarkerSinkConnectorConfig.java
+++ b/connectors/camel-freemarker-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/freemarker/CamelFreemarkerSinkConnectorConfig.java
@@ -59,6 +59,9 @@ public class CamelFreemarkerSinkConnectorConfig
     public static final String CAMEL_SINK_FREEMARKER_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.freemarker.lazyStartProducer";
     public static final String CAMEL_SINK_FREEMARKER_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_FREEMARKER_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_CONF = "camel.component.freemarker.localizedLookup";
+    public static final String CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_DOC = "Enables/disables localized template lookup. Disabled by default.";
+    public static final Boolean CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_DEFAULT = false;
     public static final String CAMEL_SINK_FREEMARKER_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.freemarker.autowiredEnabled";
     public static final String CAMEL_SINK_FREEMARKER_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_FREEMARKER_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -89,6 +92,7 @@ public class CamelFreemarkerSinkConnectorConfig
         conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_CONTEXT_MAP_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_CONTEXT_MAP_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_CONTEXT_MAP_ALL_DOC);
         conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_TEMPLATE_FROM_HEADER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_TEMPLATE_FROM_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_ALLOW_TEMPLATE_FROM_HEADER_DOC);
         conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_FREEMARKER_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_LOCALIZED_LOOKUP_DOC);
         conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_FREEMARKER_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_FREEMARKER_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_FREEMARKER_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_FREEMARKER_COMPONENT_CONFIGURATION_DOC);
         return conf;
diff --git a/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-sink.json b/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-sink.json
index b80d60c..883c3d0 100644
--- a/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-sink.json
+++ b/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-sink.json
@@ -9,18 +9,18 @@
 		"description": "Access Google Cloud BigQuery service using SQL queries."
 	},
 	"properties": {
-		"camel.sink.path.query": {
-			"name": "camel.sink.path.query",
-			"description": "BigQuery standard SQL query",
-			"priority": "HIGH",
-			"required": "true"
-		},
 		"camel.sink.path.projectId": {
 			"name": "camel.sink.path.projectId",
 			"description": "Google Cloud Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.path.queryString": {
+			"name": "camel.sink.path.queryString",
+			"description": "BigQuery standard SQL query",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
 			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
diff --git a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/camel-google-bigquery-sql-kafka-sink-connector.adoc b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/camel-google-bigquery-sql-kafka-sink-connector.adoc
index faa2fd3..5cc42d2 100644
--- a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/camel-google-bigquery-sql-kafka-sink-connector.adoc
+++ b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/camel-google-bigquery-sql-kafka-sink-connector.adoc
@@ -31,8 +31,8 @@ The camel-google-bigquery-sql sink connector supports 8 options, which are liste
 [width="100%",cols="2,5,^1,1,1",options="header"]
 |===
 | Name | Description | Default | Required | Priority
-| *camel.sink.path.query* | BigQuery standard SQL query | null | true | HIGH
 | *camel.sink.path.projectId* | Google Cloud Project Id | null | true | HIGH
+| *camel.sink.path.queryString* | BigQuery standard SQL query | null | true | HIGH
 | *camel.sink.endpoint.connectionFactory* | ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used | 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.component.google-bigquery-sql.connection Factory* | ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used | null | false | MEDIUM
diff --git a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/examples/CamelGooglebigquerysqlSinkConnector.properties b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/examples/CamelGooglebigquerysqlSinkConnector.properties
index 31ef9dd..e7cff37 100644
--- a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/examples/CamelGooglebigquerysqlSinkConnector.properties
+++ b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/docs/examples/CamelGooglebigquerysqlSinkConnector.properties
@@ -31,5 +31,5 @@ topics=
 # Google Cloud Project Id
 camel.sink.path.projectId=
 # BigQuery standard SQL query
-camel.sink.path.query=
+camel.sink.path.queryString=
 
diff --git a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysql/CamelGooglebigquerysqlSinkConnectorConfig.java b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysql/CamelGooglebigquerysqlSinkConnectorConfig.java
index 300b6e2..e162904 100644
--- a/connectors/camel-google-bigquery-sql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysql/CamelGooglebigquerysqlSinkConnectorConfig.java
+++ b/connectors/camel-google-bigquery-sql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysql/CamelGooglebigquerysqlSinkConnectorConfig.java
@@ -26,12 +26,12 @@ public class CamelGooglebigquerysqlSinkConnectorConfig
         extends
             CamelSinkConnectorConfig {
 
-    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_CONF = "camel.sink.path.query";
-    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_DOC = "BigQuery standard SQL query";
-    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_CONF = "camel.sink.path.projectId";
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_DOC = "Google Cloud Project Id";
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_CONF = "camel.sink.path.queryString";
+    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_DOC = "BigQuery standard SQL query";
+    public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_CONF = "camel.sink.endpoint.connectionFactory";
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_DOC = "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used";
     public static final String CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_DEFAULT = null;
@@ -64,8 +64,8 @@ public class CamelGooglebigquerysqlSinkConnectorConfig
 
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_DOC);
         conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_PROJECT_ID_DOC);
+        conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEBIGQUERYSQL_PATH_QUERY_STRING_DOC);
         conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_CONNECTION_FACTORY_DOC);
         conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEBIGQUERYSQL_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_GOOGLEBIGQUERYSQL_COMPONENT_CONNECTION_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEBIGQUERYSQL_COMPONENT_CONNECTION_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEBIGQUERYSQL_COMPONENT_CONNECTION_FACTORY_DOC);
diff --git a/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-source.json b/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-source.json
index a5baa63..dc63bee 100644
--- a/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-source.json
+++ b/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-source.json
@@ -43,7 +43,7 @@
 		"camel.source.endpoint.markAsRead": {
 			"name": "camel.source.endpoint.markAsRead",
 			"description": "Mark the message as read once it has been consumed",
-			"defaultValue": "false",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -247,7 +247,7 @@
 		"camel.component.google-mail-stream.markAsRead": {
 			"name": "camel.component.google-mail-stream.markAsRead",
 			"description": "Mark the message as read once it has been consumed",
-			"defaultValue": "false",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-google-mail-stream-kafka-connector/src/main/docs/camel-google-mail-stream-kafka-source-connector.adoc b/connectors/camel-google-mail-stream-kafka-connector/src/main/docs/camel-google-mail-stream-kafka-source-connector.adoc
index ecad553..fe3d5df 100644
--- a/connectors/camel-google-mail-stream-kafka-connector/src/main/docs/camel-google-mail-stream-kafka-source-connector.adoc
+++ b/connectors/camel-google-mail-stream-kafka-connector/src/main/docs/camel-google-mail-stream-kafka-source-connector.adoc
@@ -36,7 +36,7 @@ The camel-google-mail-stream source connector supports 42 options, which are lis
 | *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.clientId* | Client ID of the mail application | null | false | MEDIUM
 | *camel.source.endpoint.labels* | Comma separated list of labels to take into account | null | false | MEDIUM
-| *camel.source.endpoint.markAsRead* | Mark the message as read once it has been consumed | false | false | MEDIUM
+| *camel.source.endpoint.markAsRead* | Mark the message as read once it has been consumed | true | false | MEDIUM
 | *camel.source.endpoint.maxResults* | Max results to be returned | 10L | false | MEDIUM
 | *camel.source.endpoint.query* | The query to execute on gmail box | "is:unread" | false | MEDIUM
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
@@ -64,7 +64,7 @@ The camel-google-mail-stream source connector supports 42 options, which are lis
 | *camel.component.google-mail-stream.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.google-mail-stream.clientId* | Client ID of the mail application | null | false | MEDIUM
 | *camel.component.google-mail-stream.labels* | Comma separated list of labels to take into account | null | false | MEDIUM
-| *camel.component.google-mail-stream.markAsRead* | Mark the message as read once it has been consumed | false | false | MEDIUM
+| *camel.component.google-mail-stream.markAsRead* | Mark the message as read once it has been consumed | true | false | MEDIUM
 | *camel.component.google-mail-stream.maxResults* | Max results to be returned | 10L | false | MEDIUM
 | *camel.component.google-mail-stream.query* | The query to execute on gmail box | "is:unread" | false | MEDIUM
 | *camel.component.google-mail-stream.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
diff --git a/connectors/camel-google-mail-stream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailstream/CamelGooglemailstreamSourceConnectorConfig.java b/connectors/camel-google-mail-stream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailstream/CamelGooglemailstreamSourceConnectorConfig.java
index 3018733..b639ab3 100644
--- a/connectors/camel-google-mail-stream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailstream/CamelGooglemailstreamSourceConnectorConfig.java
+++ b/connectors/camel-google-mail-stream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailstream/CamelGooglemailstreamSourceConnectorConfig.java
@@ -43,7 +43,7 @@ public class CamelGooglemailstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_LABELS_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MARK_AS_READ_CONF = "camel.source.endpoint.markAsRead";
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MARK_AS_READ_DOC = "Mark the message as read once it has been consumed";
-    public static final Boolean CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MARK_AS_READ_DEFAULT = false;
+    public static final Boolean CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MARK_AS_READ_DEFAULT = true;
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MAX_RESULTS_CONF = "camel.source.endpoint.maxResults";
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MAX_RESULTS_DOC = "Max results to be returned";
     public static final Long CAMEL_SOURCE_GOOGLEMAILSTREAM_ENDPOINT_MAX_RESULTS_DEFAULT = 10L;
@@ -127,7 +127,7 @@ public class CamelGooglemailstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_LABELS_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MARK_AS_READ_CONF = "camel.component.google-mail-stream.markAsRead";
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MARK_AS_READ_DOC = "Mark the message as read once it has been consumed";
-    public static final Boolean CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MARK_AS_READ_DEFAULT = false;
+    public static final Boolean CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MARK_AS_READ_DEFAULT = true;
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MAX_RESULTS_CONF = "camel.component.google-mail-stream.maxResults";
     public static final String CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MAX_RESULTS_DOC = "Max results to be returned";
     public static final Long CAMEL_SOURCE_GOOGLEMAILSTREAM_COMPONENT_MAX_RESULTS_DEFAULT = 10L;
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
index e932581..ae5d4c8 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
@@ -11,13 +11,13 @@
 	"properties": {
 		"camel.sink.path.projectId": {
 			"name": "camel.sink.path.projectId",
-			"description": "Project Id",
+			"description": "The Google Cloud PubSub Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
 		"camel.sink.path.destinationName": {
 			"name": "camel.sink.path.destinationName",
-			"description": "Destination Name",
+			"description": "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.sink.endpoint.synchronousPull": {
 			"name": "camel.sink.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
@@ -91,6 +97,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.google-pubsub.serviceAccountKey": {
+			"name": "camel.component.google-pubsub.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.component.google-pubsub.lazyStartProducer": {
 			"name": "camel.component.google-pubsub.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
index 5f7616a..2d15f15 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
@@ -11,13 +11,13 @@
 	"properties": {
 		"camel.source.path.projectId": {
 			"name": "camel.source.path.projectId",
-			"description": "Project Id",
+			"description": "The Google Cloud PubSub Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
 		"camel.source.path.destinationName": {
 			"name": "camel.source.path.destinationName",
-			"description": "Destination Name",
+			"description": "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.source.endpoint.synchronousPull": {
 			"name": "camel.source.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
@@ -89,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.google-pubsub.serviceAccountKey": {
+			"name": "camel.component.google-pubsub.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.component.google-pubsub.bridgeErrorHandler": {
 			"name": "camel.component.google-pubsub.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
index 292449e..e56c714 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
@@ -24,25 +24,27 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSi
 ----
 
 
-The camel-google-pubsub sink connector supports 17 options, which are listed below.
+The camel-google-pubsub sink connector supports 19 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,1,1",options="header"]
 |===
 | Name | Description | Default | Required | Priority
-| *camel.sink.path.projectId* | Project Id | null | true | HIGH
-| *camel.sink.path.destinationName* | Destination Name | null | true | HIGH
+| *camel.sink.path.projectId* | The Google Cloud PubSub Project Id | null | true | HIGH
+| *camel.sink.path.destinationName* | The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name. | null | true | HIGH
 | *camel.sink.endpoint.ackMode* | AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream process has to ack/nack explicitly One of: [AUTO] [NONE] | "AUTO" | false | MEDIUM
 | *camel.sink.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.sink.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.sink.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | true | HIGH
 | *camel.sink.endpoint.synchronousPull* | Synchronously pull batches of messages | 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.messageOrderingEnabled* | Should message ordering be enabled | false | false | MEDIUM
 | *camel.sink.endpoint.pubsubEndpoint* | Pub/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used | null | false | MEDIUM
 | *camel.sink.endpoint.serializer* | A custom GooglePubsubSerializer to use for serializing message payloads in the producer | null | false | MEDIUM
 | *camel.component.google-pubsub.endpoint* | Endpoint to use with local Pub/Sub emulator. | null | false | MEDIUM
+| *camel.component.google-pubsub.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | true | HIGH
 | *camel.component.google-pubsub.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 processe [...]
 | *camel.component.google-pubsub.publisherCacheSize* | Maximum number of producers to cache. This could be increased if you have producers for lots of different topics. | null | false | MEDIUM
 | *camel.component.google-pubsub.publisherCache Timeout* | How many milliseconds should each producer stay alive in the cache. | null | false | MEDIUM
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
index 316316c..1821bc4 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
@@ -24,24 +24,26 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSo
 ----
 
 
-The camel-google-pubsub source connector supports 14 options, which are listed below.
+The camel-google-pubsub source connector supports 16 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,1,1",options="header"]
 |===
 | Name | Description | Default | Required | Priority
-| *camel.source.path.projectId* | Project Id | null | true | HIGH
-| *camel.source.path.destinationName* | Destination Name | null | true | HIGH
+| *camel.source.path.projectId* | The Google Cloud PubSub Project Id | null | true | HIGH
+| *camel.source.path.destinationName* | The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name. | null | true | HIGH
 | *camel.source.endpoint.ackMode* | AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream process has to ack/nack explicitly One of: [AUTO] [NONE] | "AUTO" | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.source.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.source.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | true | HIGH
 | *camel.source.endpoint.synchronousPull* | Synchronously pull batches of messages | false | 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.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.component.google-pubsub.endpoint* | Endpoint to use with local Pub/Sub emulator. | null | false | MEDIUM
+| *camel.component.google-pubsub.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | true | HIGH
 | *camel.component.google-pubsub.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.google-pubsub.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.google-pubsub.publisherTermination Timeout* | How many milliseconds should a producer be allowed to terminate. | null | false | MEDIUM
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSinkConnector.properties b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSinkConnector.properties
index 96afc54..85f993a 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSinkConnector.properties
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSinkConnector.properties
@@ -28,8 +28,12 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# Destination Name
+# The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.
+camel.component.google-pubsub.serviceAccountKey=
+# The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.
+camel.sink.endpoint.serviceAccountKey=
+# The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.
 camel.sink.path.destinationName=
-# Project Id
+# The Google Cloud PubSub Project Id
 camel.sink.path.projectId=
 
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSourceConnector.properties b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSourceConnector.properties
index 578c6f9..60c07d6 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSourceConnector.properties
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/examples/CamelGooglepubsubSourceConnector.properties
@@ -28,8 +28,12 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# Destination Name
+# The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.
+camel.component.google-pubsub.serviceAccountKey=
+# The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.
+camel.source.endpoint.serviceAccountKey=
+# The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.
 camel.source.path.destinationName=
-# Project Id
+# The Google Cloud PubSub Project Id
 camel.source.path.projectId=
 
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
index e1a12a7..9edfacd 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
@@ -27,10 +27,10 @@ public class CamelGooglepubsubSinkConnectorConfig
             CamelSinkConnectorConfig {
 
     public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_PROJECT_ID_CONF = "camel.sink.path.projectId";
-    public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_PROJECT_ID_DOC = "Project Id";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_PROJECT_ID_DOC = "The Google Cloud PubSub Project Id";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_PROJECT_ID_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_DESTINATION_NAME_CONF = "camel.sink.path.destinationName";
-    public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DOC = "Destination Name";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DOC = "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_ACK_MODE_CONF = "camel.sink.endpoint.ackMode";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_ACK_MODE_DOC = "AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream process has to ack/nack explicitly One of: [AUTO] [NONE]";
@@ -44,6 +44,9 @@ public class CamelGooglepubsubSinkConnectorConfig
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF = "camel.sink.endpoint.maxMessagesPerPoll";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC = "The max number of messages to receive from the server in a single API call";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT = "1";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.sink.endpoint.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF = "camel.sink.endpoint.synchronousPull";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC = "Synchronously pull batches of messages";
     public static final Boolean CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT = false;
@@ -62,6 +65,9 @@ public class CamelGooglepubsubSinkConnectorConfig
     public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_CONF = "camel.component.google-pubsub.endpoint";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DOC = "Endpoint to use with local Pub/Sub emulator.";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-pubsub.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.google-pubsub.lazyStartProducer";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_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 t [...]
     public static final Boolean CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -96,12 +102,14 @@ public class CamelGooglepubsubSinkConnectorConfig
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC);
+        conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_PUBSUB_ENDPOINT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_PUBSUB_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_PUBSUB_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DOC);
+        conf.define(CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_SIZE_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_TIMEOUT_CONF, ConfigDef.Type.INT, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_COMPONENT_PUBLISHER_CACHE_TIMEOUT_DOC);
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
index 960e8db..d01a80d 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
@@ -27,10 +27,10 @@ public class CamelGooglepubsubSourceConnectorConfig
             CamelSourceConnectorConfig {
 
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_PROJECT_ID_CONF = "camel.source.path.projectId";
-    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_PROJECT_ID_DOC = "Project Id";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_PROJECT_ID_DOC = "The Google Cloud PubSub Project Id";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_PROJECT_ID_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_DESTINATION_NAME_CONF = "camel.source.path.destinationName";
-    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DOC = "Destination Name";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DOC = "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_PATH_DESTINATION_NAME_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_ACK_MODE_CONF = "camel.source.endpoint.ackMode";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_ACK_MODE_DOC = "AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream process has to ack/nack explicitly One of: [AUTO] [NONE]";
@@ -44,6 +44,9 @@ public class CamelGooglepubsubSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF = "camel.source.endpoint.maxMessagesPerPoll";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC = "The max number of messages to receive from the server in a single API call";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT = "1";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.source.endpoint.serviceAccountKey";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF = "camel.source.endpoint.synchronousPull";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC = "Synchronously pull batches of messages";
     public static final Boolean CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT = false;
@@ -59,6 +62,9 @@ public class CamelGooglepubsubSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_CONF = "camel.component.google-pubsub.endpoint";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DOC = "Endpoint to use with local Pub/Sub emulator.";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-pubsub.serviceAccountKey";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.google-pubsub.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_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 a [...]
     public static final Boolean CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
@@ -88,11 +94,13 @@ public class CamelGooglepubsubSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_ENDPOINT_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_PUBLISHER_TERMINATION_TIMEOUT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_PUBLISHER_TERMINATION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_COMPONENT_PUBLISHER_TERMINATION_TIMEOUT_DOC);
diff --git a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
index 6f1ae7a..7ab2e41 100644
--- a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
+++ b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -202,27 +216,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maxTotalConnections": {
 			"name": "camel.sink.endpoint.maxTotalConnections",
 			"description": "The maximum number of connections.",
@@ -372,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.copyHeaders": {
+			"name": "camel.component.http.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.lazyStartProducer": {
 			"name": "camel.component.http.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 [...]
@@ -379,6 +379,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.responsePayloadStreamingThreshold": {
+			"name": "camel.component.http.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipRequestHeaders": {
+			"name": "camel.component.http.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipResponseHeaders": {
+			"name": "camel.component.http.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.allowJavaSerializedObject": {
 			"name": "camel.component.http.allowJavaSerializedObject",
 			"description": "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.",
@@ -386,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.authCachingDisabled": {
+			"name": "camel.component.http.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.automaticRetriesDisabled": {
+			"name": "camel.component.http.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.autowiredEnabled": {
 			"name": "camel.component.http.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -406,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.connectionStateDisabled": {
+			"name": "camel.component.http.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.connectionTimeToLive": {
 			"name": "camel.component.http.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.contentCompressionDisabled": {
+			"name": "camel.component.http.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.cookieManagementDisabled": {
+			"name": "camel.component.http.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.defaultUserAgentDisabled": {
+			"name": "camel.component.http.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.httpBinding": {
 			"name": "camel.component.http.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -443,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.redirectHandlingDisabled": {
+			"name": "camel.component.http.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.headerFilterStrategy": {
 			"name": "camel.component.http.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc b/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
index 59ada9d..231508a 100644
--- a/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
+++ b/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.http.CamelHttpSinkConnector
 ----
 
 
-The camel-http sink connector supports 78 options, which are listed below.
+The camel-http sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-http sink connector supports 78 options, which are listed below.
 | *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.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-http sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -59,9 +61,6 @@ The camel-http sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.httpClientConfigurer* | Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc. | null | false | MEDIUM
 | *camel.sink.endpoint.httpClientOptions* | To configure the HttpClient using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.httpContext* | To use a custom HttpContext instance | null | 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.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
 | *camel.sink.endpoint.useSystemProperties* | To use System Properties as fallback for configuration | false | false | MEDIUM
 | *camel.sink.endpoint.proxyAuthDomain* | Proxy authentication domain to use with NTML | null | false | MEDIUM
@@ -84,17 +83,28 @@ The camel-http sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.http.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.http.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.http.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.http.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.http.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.http.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.http.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.http.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.http.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.http.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.http.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.http.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.http.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.http.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.http.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.http.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.http.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.http.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.http.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.http.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.http.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.http.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.http.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.http.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.http.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.http.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java b/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
index 451875f..bea2493 100644
--- a/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
+++ b/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
@@ -43,7 +43,7 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CHUNKED_DOC = "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response";
     public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_CHUNKED_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -87,6 +87,12 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_CONF = "camel.sink.endpoint.clientBuilder";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DOC = "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DEFAULT = null;
@@ -108,15 +114,6 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_CONF = "camel.sink.endpoint.httpContext";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_DOC = "To use a custom HttpContext instance";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_DEFAULT = null;
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.sink.endpoint.mapHttpMessageBody";
-    public static final String CAMEL_SINK_HTTP_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_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF = "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody";
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC = "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.";
-    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.sink.endpoint.mapHttpMessageHeaders";
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
-    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_CONF = "camel.sink.endpoint.maxTotalConnections";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
@@ -183,12 +180,30 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_CONF = "camel.component.http.cookieStore";
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DOC = "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy).";
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_CONF = "camel.component.http.copyHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.http.lazyStartProducer";
     public static final String CAMEL_SINK_HTTP_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_HTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.http.responsePayloadStreamingThreshold";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
+    public static final Integer CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.http.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.http.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.http.allowJavaSerializedObject";
     public static final String CAMEL_SINK_HTTP_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_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.http.authCachingDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.http.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.http.autowiredEnabled";
     public static final String CAMEL_SINK_HTTP_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_HTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -198,9 +213,21 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_CONF = "camel.component.http.connectionsPerRoute";
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DOC = "The maximum number of connections per route.";
     public static final Integer CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT = 20;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.http.connectionStateDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF = "camel.component.http.connectionTimeToLive";
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.";
     public static final Long CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.http.contentCompressionDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.http.cookieManagementDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.http.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_CONF = "camel.component.http.httpBinding";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -216,6 +243,9 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF = "camel.component.http.maxTotalConnections";
     public static final String CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.http.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.http.headerFilterStrategy";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -292,6 +322,8 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_DOC);
@@ -299,9 +331,6 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CLIENT_OPTIONS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_HTTP_CONTEXT_DOC);
-        conf.define(CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
-        conf.define(CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
-        conf.define(CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_MAX_TOTAL_CONNECTIONS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_USE_SYSTEM_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_USE_SYSTEM_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_PROXY_AUTH_DOMAIN_DOC);
@@ -324,17 +353,28 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_DOC);
diff --git a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
index e592f2f..9cf955c 100644
--- a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
+++ b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -202,27 +216,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maxTotalConnections": {
 			"name": "camel.sink.endpoint.maxTotalConnections",
 			"description": "The maximum number of connections.",
@@ -372,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.copyHeaders": {
+			"name": "camel.component.https.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.lazyStartProducer": {
 			"name": "camel.component.https.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 [...]
@@ -379,6 +379,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.responsePayloadStreamingThreshold": {
+			"name": "camel.component.https.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipRequestHeaders": {
+			"name": "camel.component.https.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipResponseHeaders": {
+			"name": "camel.component.https.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "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.",
@@ -386,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.authCachingDisabled": {
+			"name": "camel.component.https.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.automaticRetriesDisabled": {
+			"name": "camel.component.https.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.autowiredEnabled": {
 			"name": "camel.component.https.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -406,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.connectionStateDisabled": {
+			"name": "camel.component.https.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.connectionTimeToLive": {
 			"name": "camel.component.https.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.contentCompressionDisabled": {
+			"name": "camel.component.https.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.cookieManagementDisabled": {
+			"name": "camel.component.https.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.defaultUserAgentDisabled": {
+			"name": "camel.component.https.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.httpBinding": {
 			"name": "camel.component.https.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -443,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.redirectHandlingDisabled": {
+			"name": "camel.component.https.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc b/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
index 2c8fe87..5c19060 100644
--- a/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
+++ b/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.https.CamelHttpsSinkConnector
 ----
 
 
-The camel-https sink connector supports 78 options, which are listed below.
+The camel-https sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-https sink connector supports 78 options, which are listed below.
 | *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.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-https sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -59,9 +61,6 @@ The camel-https sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.httpClientConfigurer* | Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc. | null | false | MEDIUM
 | *camel.sink.endpoint.httpClientOptions* | To configure the HttpClient using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.httpContext* | To use a custom HttpContext instance | null | 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.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
 | *camel.sink.endpoint.useSystemProperties* | To use System Properties as fallback for configuration | false | false | MEDIUM
 | *camel.sink.endpoint.proxyAuthDomain* | Proxy authentication domain to use with NTML | null | false | MEDIUM
@@ -84,17 +83,28 @@ The camel-https sink connector supports 78 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.https.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.https.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.https.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.https.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.https.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.https.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.https.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.https.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.https.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.https.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.https.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.https.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.https.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.https.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.https.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.https.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.https.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.https.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.https.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.https.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.https.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.https.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.https.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.https.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.https.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.https.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
index 615646c..7ef7e93 100644
--- a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
+++ b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
@@ -43,7 +43,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CHUNKED_DOC = "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_CHUNKED_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -87,6 +87,12 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_CONF = "camel.sink.endpoint.clientBuilder";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DOC = "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DEFAULT = null;
@@ -108,15 +114,6 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_CONF = "camel.sink.endpoint.httpContext";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_DOC = "To use a custom HttpContext instance";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_DEFAULT = null;
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.sink.endpoint.mapHttpMessageBody";
-    public static final String CAMEL_SINK_HTTPS_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_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF = "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody";
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC = "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.";
-    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.sink.endpoint.mapHttpMessageHeaders";
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
-    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_CONF = "camel.sink.endpoint.maxTotalConnections";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
@@ -183,12 +180,30 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_CONF = "camel.component.https.cookieStore";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DOC = "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy).";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_CONF = "camel.component.https.copyHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.https.lazyStartProducer";
     public static final String CAMEL_SINK_HTTPS_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_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.https.responsePayloadStreamingThreshold";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
+    public static final Integer CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.https.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.https.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.https.allowJavaSerializedObject";
     public static final String CAMEL_SINK_HTTPS_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_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.https.authCachingDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.https.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.https.autowiredEnabled";
     public static final String CAMEL_SINK_HTTPS_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_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -198,9 +213,21 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_CONF = "camel.component.https.connectionsPerRoute";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DOC = "The maximum number of connections per route.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT = 20;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.https.connectionStateDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF = "camel.component.https.connectionTimeToLive";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.";
     public static final Long CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.https.contentCompressionDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.https.cookieManagementDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.https.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_CONF = "camel.component.https.httpBinding";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -216,6 +243,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF = "camel.component.https.maxTotalConnections";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.https.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.https.headerFilterStrategy";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -292,6 +322,8 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_DOC);
@@ -299,9 +331,6 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CLIENT_OPTIONS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_CONTEXT_DOC);
-        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
-        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
-        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_PROXY_AUTH_DOMAIN_DOC);
@@ -324,17 +353,28 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DOC);
diff --git a/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-source.json b/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-source.json
index c4f030d..2aa8c82 100644
--- a/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-source.json
+++ b/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-source.json
@@ -185,26 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.multipartFilter": {
-			"name": "camel.source.endpoint.multipartFilter",
-			"description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -226,6 +206,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.multipartFilter": {
+			"name": "camel.source.endpoint.multipartFilter",
+			"description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sslContextParameters": {
 			"name": "camel.source.endpoint.sslContextParameters",
 			"description": "To configure security using SSLContextParameters",
diff --git a/connectors/camel-jetty-kafka-connector/src/main/docs/camel-jetty-kafka-source-connector.adoc b/connectors/camel-jetty-kafka-connector/src/main/docs/camel-jetty-kafka-source-connector.adoc
index 02773bc..5cbe778 100644
--- a/connectors/camel-jetty-kafka-connector/src/main/docs/camel-jetty-kafka-source-connector.adoc
+++ b/connectors/camel-jetty-kafka-connector/src/main/docs/camel-jetty-kafka-source-connector.adoc
@@ -57,12 +57,12 @@ The camel-jetty source connector supports 65 options, which are listed below.
 | *camel.source.endpoint.filterInitParameters* | Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jetty server. | null | false | MEDIUM
 | *camel.source.endpoint.filters* | Allows using a custom filters which is putted into a list and can be find in the Registry. Multiple values can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.handlers* | Specifies a comma-delimited set of Handler instances to lookup in your Registry. These handlers are added to the Jetty servlet context (for example, to add security). Important: You can not use different handlers with different Jetty endpoints using the same port number. The handlers is associated to the port number. If you need different handlers, then use different port numbers. | null | false | MEDIUM
-| *camel.source.endpoint.multipartFilter* | Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true. | 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.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
+| *camel.source.endpoint.multipartFilter* | Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true. | 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.sslContextParameters* | To configure security using SSLContextParameters | null | false | MEDIUM
 | *camel.component.jetty.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.jetty.continuationTimeout* | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | "30000" | false | MEDIUM
diff --git a/connectors/camel-jetty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jetty/CamelJettySourceConnectorConfig.java b/connectors/camel-jetty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jetty/CamelJettySourceConnectorConfig.java
index 881bd3c..3211df9 100644
--- a/connectors/camel-jetty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jetty/CamelJettySourceConnectorConfig.java
+++ b/connectors/camel-jetty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jetty/CamelJettySourceConnectorConfig.java
@@ -104,15 +104,6 @@ public class CamelJettySourceConnectorConfig
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_CONF = "camel.source.endpoint.handlers";
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_DOC = "Specifies a comma-delimited set of Handler instances to lookup in your Registry. These handlers are added to the Jetty servlet context (for example, to add security). Important: You can not use different handlers with different Jetty endpoints using the same port number. The handlers is associated to the port number. If you need different handlers, then use different port numbers.";
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_CONF = "camel.source.endpoint.multipartFilter";
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DOC = "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.";
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
-    public static final Boolean CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
-    public static final String CAMEL_SOURCE_JETTY_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_JETTY_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.source.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SOURCE_JETTY_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_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -122,6 +113,15 @@ public class CamelJettySourceConnectorConfig
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.source.endpoint.mapHttpMessageHeaders";
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
     public static final Boolean CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_CONF = "camel.source.endpoint.multipartFilter";
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DOC = "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.";
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DEFAULT = null;
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
+    public static final Boolean CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
+    public static final String CAMEL_SOURCE_JETTY_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_JETTY_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF = "camel.source.endpoint.sslContextParameters";
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC = "To configure security using SSLContextParameters";
     public static final String CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT = null;
@@ -260,12 +260,12 @@ public class CamelJettySourceConnectorConfig
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_FILTER_INIT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_FILTER_INIT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_FILTER_INIT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_FILTERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_FILTERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_FILTERS_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_HANDLERS_DOC);
-        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DOC);
-        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
+        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_MULTIPART_FILTER_DOC);
+        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_OPTIONS_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_TRACE_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_JETTY_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_JETTY_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_JETTY_COMPONENT_CONTINUATION_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_JETTY_COMPONENT_CONTINUATION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_JETTY_COMPONENT_CONTINUATION_TIMEOUT_DOC);
diff --git a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
index 42ba6a0..04c880b 100644
--- a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
+++ b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
@@ -220,6 +220,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.pollOnError": {
+			"name": "camel.source.endpoint.pollOnError",
+			"description": "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message again RETRY will let t [...]
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DISCARD",
+				"ERROR_HANDLER",
+				"RECONNECT",
+				"RETRY",
+				"STOP"
+			]
+		},
 		"camel.source.endpoint.pollTimeoutMs": {
 			"name": "camel.source.endpoint.pollTimeoutMs",
 			"description": "The timeout used when polling the KafkaConsumer.",
@@ -638,6 +651,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.pollOnError": {
+			"name": "camel.component.kafka.pollOnError",
+			"description": "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message again RETRY will let t [...]
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DISCARD",
+				"ERROR_HANDLER",
+				"RECONNECT",
+				"RETRY",
+				"STOP"
+			]
+		},
 		"camel.component.kafka.pollTimeoutMs": {
 			"name": "camel.component.kafka.pollTimeoutMs",
 			"description": "The timeout used when polling the KafkaConsumer.",
@@ -689,6 +715,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.pollExceptionStrategy": {
+			"name": "camel.component.kafka.pollExceptionStrategy",
+			"description": "To use a custom strategy with the consumer to control how to handle exceptions thrown from the Kafka broker while pooling messages.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.autowiredEnabled": {
 			"name": "camel.component.kafka.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
index 03f8c86..5686b4b 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
+++ b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.kafka.CamelKafkaSourceConnector
 ----
 
 
-The camel-kafka source connector supports 122 options, which are listed below.
+The camel-kafka source connector supports 125 options, which are listed below.
 
 
 
@@ -61,6 +61,7 @@ The camel-kafka source connector supports 122 options, which are listed below.
 | *camel.source.endpoint.maxPollRecords* | The maximum number of records returned in a single call to poll() | "500" | false | MEDIUM
 | *camel.source.endpoint.offsetRepository* | The offset repository to use in order to locally store the offset of each partition of the topic. Defining one will disable the autocommit. | null | false | MEDIUM
 | *camel.source.endpoint.partitionAssignor* | The class name of the partition assignment strategy that the client will use to distribute partition ownership amongst consumer instances when group management is used | "org.apache.kafka.clients.consumer.RangeAssignor" | false | MEDIUM
+| *camel.source.endpoint.pollOnError* | What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message a [...]
 | *camel.source.endpoint.pollTimeoutMs* | The timeout used when polling the KafkaConsumer. | "5000" | false | MEDIUM
 | *camel.source.endpoint.seekTo* | Set if KafkaConsumer will read from beginning or end on startup: beginning : read from beginning end : read from end This is replacing the earlier property seekToBeginning One of: [beginning] [end] | null | false | MEDIUM
 | *camel.source.endpoint.sessionTimeoutMs* | The timeout used to detect failures when using Kafka's group management facilities. | "10000" | false | MEDIUM
@@ -121,6 +122,7 @@ The camel-kafka source connector supports 122 options, which are listed below.
 | *camel.component.kafka.maxPollRecords* | The maximum number of records returned in a single call to poll() | "500" | false | MEDIUM
 | *camel.component.kafka.offsetRepository* | The offset repository to use in order to locally store the offset of each partition of the topic. Defining one will disable the autocommit. | null | false | MEDIUM
 | *camel.component.kafka.partitionAssignor* | The class name of the partition assignment strategy that the client will use to distribute partition ownership amongst consumer instances when group management is used | "org.apache.kafka.clients.consumer.RangeAssignor" | false | MEDIUM
+| *camel.component.kafka.pollOnError* | What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect the consumer and try poll the message a [...]
 | *camel.component.kafka.pollTimeoutMs* | The timeout used when polling the KafkaConsumer. | "5000" | false | MEDIUM
 | *camel.component.kafka.seekTo* | Set if KafkaConsumer will read from beginning or end on startup: beginning : read from beginning end : read from end This is replacing the earlier property seekToBeginning One of: [beginning] [end] | null | false | MEDIUM
 | *camel.component.kafka.sessionTimeoutMs* | The timeout used to detect failures when using Kafka's group management facilities. | "10000" | false | MEDIUM
@@ -128,6 +130,7 @@ The camel-kafka source connector supports 122 options, which are listed below.
 | *camel.component.kafka.topicIsPattern* | Whether the topic is a pattern (regular expression). This can be used to subscribe to dynamic number of topics matching the pattern. | false | false | MEDIUM
 | *camel.component.kafka.valueDeserializer* | Deserializer class for value that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.component.kafka.kafkaManualCommitFactory* | Factory to use for creating KafkaManualCommit instances. This allows to plugin a custom factory to create custom KafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box. | null | false | MEDIUM
+| *camel.component.kafka.pollExceptionStrategy* | To use a custom strategy with the consumer to control how to handle exceptions thrown from the Kafka broker while pooling messages. | null | false | MEDIUM
 | *camel.component.kafka.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.kafka.kafkaClientFactory* | Factory to use for creating org.apache.kafka.clients.consumer.KafkaConsumer and org.apache.kafka.clients.producer.KafkaProducer instances. This allows to configure a custom factory to create instances with logic that extends the vanilla Kafka clients. | null | false | MEDIUM
 | *camel.component.kafka.synchronous* | Sets whether synchronous processing should be strictly used | false | false | MEDIUM
diff --git a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
index b4af220..aa346f0 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
+++ b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
@@ -116,6 +116,9 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_CONF = "camel.source.endpoint.partitionAssignor";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_DOC = "The class name of the partition assignment strategy that the client will use to distribute partition ownership amongst consumer instances when group management is used";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_DEFAULT = "org.apache.kafka.clients.consumer.RangeAssignor";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_CONF = "camel.source.endpoint.pollOnError";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_DOC = "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connect [...]
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_CONF = "camel.source.endpoint.pollTimeoutMs";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_DOC = "The timeout used when polling the KafkaConsumer.";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_DEFAULT = "5000";
@@ -296,6 +299,9 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_CONF = "camel.component.kafka.partitionAssignor";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_DOC = "The class name of the partition assignment strategy that the client will use to distribute partition ownership amongst consumer instances when group management is used";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_DEFAULT = "org.apache.kafka.clients.consumer.RangeAssignor";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_CONF = "camel.component.kafka.pollOnError";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_DOC = "What to do if kafka threw an exception while polling for new messages. Will by default use the value from the component configuration unless an explicit value has been configured on the endpoint level. DISCARD will discard the message and continue to poll next message. ERROR_HANDLER will use Camel's error handler to process the exception, and afterwards continue to poll next message. RECONNECT will re-connec [...]
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_CONF = "camel.component.kafka.pollTimeoutMs";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_DOC = "The timeout used when polling the KafkaConsumer.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_DEFAULT = "5000";
@@ -317,6 +323,9 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_CONF = "camel.component.kafka.kafkaManualCommitFactory";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DOC = "Factory to use for creating KafkaManualCommit instances. This allows to plugin a custom factory to create custom KafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_CONF = "camel.component.kafka.pollExceptionStrategy";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_DOC = "To use a custom strategy with the consumer to control how to handle exceptions thrown from the Kafka broker while pooling messages.";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.kafka.autowiredEnabled";
     public static final String CAMEL_SOURCE_KAFKA_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_KAFKA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -435,6 +444,7 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_RECORDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_RECORDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_RECORDS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_OFFSET_REPOSITORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_OFFSET_REPOSITORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_OFFSET_REPOSITORY_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_PARTITION_ASSIGNOR_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_POLL_TIMEOUT_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_SEEK_TO_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_SEEK_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_SEEK_TO_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_SESSION_TIMEOUT_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_SESSION_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_SESSION_TIMEOUT_MS_DOC);
@@ -495,6 +505,7 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_RECORDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_RECORDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_RECORDS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_OFFSET_REPOSITORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_OFFSET_REPOSITORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_OFFSET_REPOSITORY_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_PARTITION_ASSIGNOR_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_TIMEOUT_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_SEEK_TO_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_SEEK_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_SEEK_TO_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_SESSION_TIMEOUT_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_SESSION_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_SESSION_TIMEOUT_MS_DOC);
@@ -502,6 +513,7 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_TOPIC_IS_PATTERN_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KAFKA_COMPONENT_TOPIC_IS_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_TOPIC_IS_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_VALUE_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_VALUE_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_VALUE_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_POLL_EXCEPTION_STRATEGY_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KAFKA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_CLIENT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_CLIENT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_CLIENT_FACTORY_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KAFKA_COMPONENT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_SYNCHRONOUS_DOC);
diff --git a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
index f65220a..fcf5581 100644
--- a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
+++ b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
@@ -180,6 +180,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.hostnameVerification": {
+			"name": "camel.sink.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.allowSerializedHeaders": {
 			"name": "camel.sink.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -506,6 +513,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty-http.hostnameVerification": {
+			"name": "camel.component.netty-http.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty-http.allowSerializedHeaders": {
 			"name": "camel.component.netty-http.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-source.json b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-source.json
index a0e8a6e..6ac3af1 100644
--- a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-source.json
+++ b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-source.json
@@ -282,6 +282,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.hostnameVerification": {
+			"name": "camel.source.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.allowSerializedHeaders": {
 			"name": "camel.source.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -683,6 +690,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty-http.hostnameVerification": {
+			"name": "camel.component.netty-http.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty-http.allowSerializedHeaders": {
 			"name": "camel.component.netty-http.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-sink-connector.adoc b/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-sink-connector.adoc
index b00f735..872422c 100644
--- a/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-sink-connector.adoc
+++ b/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.nettyhttp.CamelNettyhttpSinkConn
 ----
 
 
-The camel-netty-http sink connector supports 111 options, which are listed below.
+The camel-netty-http sink connector supports 113 options, which are listed below.
 
 
 
@@ -56,6 +56,7 @@ The camel-netty-http sink connector supports 111 options, which are listed below
 | *camel.sink.endpoint.producerPoolMinEvictableIdle* | Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor. | 300000L | false | MEDIUM
 | *camel.sink.endpoint.producerPoolMinIdle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | null | false | MEDIUM
 | *camel.sink.endpoint.useRelativePath* | Sets whether to use a relative path in HTTP requests. | true | false | MEDIUM
+| *camel.sink.endpoint.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.sink.endpoint.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.sink.endpoint.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
 | *camel.sink.endpoint.configuration* | To use a custom configured NettyHttpConfiguration for configuring this endpoint. | null | false | MEDIUM
@@ -106,6 +107,7 @@ The camel-netty-http sink connector supports 111 options, which are listed below
 | *camel.component.netty-http.producerPoolMinIdle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | null | false | MEDIUM
 | *camel.component.netty-http.udpConnectionless Sending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | false | MEDIUM
 | *camel.component.netty-http.useByteBuf* | If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out. | false | false | MEDIUM
+| *camel.component.netty-http.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.component.netty-http.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.component.netty-http.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.netty-http.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
diff --git a/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-source-connector.adoc b/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-source-connector.adoc
index 9d9a9b3..5ea81c5 100644
--- a/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-source-connector.adoc
+++ b/connectors/camel-netty-http-kafka-connector/src/main/docs/camel-netty-http-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.nettyhttp.CamelNettyhttpSourceCo
 ----
 
 
-The camel-netty-http source connector supports 131 options, which are listed below.
+The camel-netty-http source connector supports 133 options, which are listed below.
 
 
 
@@ -67,6 +67,7 @@ The camel-netty-http source connector supports 131 options, which are listed bel
 | *camel.source.endpoint.traceEnabled* | Specifies whether to enable HTTP TRACE for this Netty HTTP consumer. By default TRACE is turned off. | false | false | MEDIUM
 | *camel.source.endpoint.urlDecodeHeaders* | If this option is enabled, then during binding from Netty to Camel Message then the header values will be URL decoded (eg %20 will be a space character. Notice this option is used by the default org.apache.camel.component.netty.http.NettyHttpBinding and therefore if you implement a custom org.apache.camel.component.netty.http.NettyHttpBinding then you would need to decode the headers accordingly to this option. | false | false | MEDIUM
 | *camel.source.endpoint.usingExecutorService* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | false | MEDIUM
+| *camel.source.endpoint.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.source.endpoint.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.source.endpoint.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
 | *camel.source.endpoint.configuration* | To use a custom configured NettyHttpConfiguration for configuring this endpoint. | null | false | MEDIUM
@@ -125,6 +126,7 @@ The camel-netty-http source connector supports 131 options, which are listed bel
 | *camel.component.netty-http.serverExceptionCaught LogLevel* | If the server (NettyConsumer) catches an exception then its logged using this logging level. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "WARN" | false | MEDIUM
 | *camel.component.netty-http.serverInitializer Factory* | To use a custom ServerInitializerFactory | null | false | MEDIUM
 | *camel.component.netty-http.usingExecutorService* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | false | MEDIUM
+| *camel.component.netty-http.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.component.netty-http.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.component.netty-http.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.netty-http.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
diff --git a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
index 9c8dae1..9596363 100644
--- a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
+++ b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
@@ -101,6 +101,9 @@ public class CamelNettyhttpSinkConnectorConfig
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_CONF = "camel.sink.endpoint.useRelativePath";
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_DOC = "Sets whether to use a relative path in HTTP requests.";
     public static final Boolean CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_DEFAULT = true;
+    public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_CONF = "camel.sink.endpoint.hostnameVerification";
+    public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.sink.endpoint.allowSerializedHeaders";
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -251,6 +254,9 @@ public class CamelNettyhttpSinkConnectorConfig
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_CONF = "camel.component.netty-http.useByteBuf";
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_DOC = "If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out.";
     public static final Boolean CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_DEFAULT = false;
+    public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_CONF = "camel.component.netty-http.hostnameVerification";
+    public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.component.netty-http.allowSerializedHeaders";
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -397,6 +403,7 @@ public class CamelNettyhttpSinkConnectorConfig
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_EVICTABLE_IDLE_CONF, ConfigDef.Type.LONG, CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_EVICTABLE_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_EVICTABLE_IDLE_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_IDLE_CONF, ConfigDef.Type.INT, CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MIN_IDLE_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_USE_RELATIVE_PATH_DOC);
+        conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_ENDPOINT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_NETTYHTTP_ENDPOINT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_ENDPOINT_CONFIGURATION_DOC);
@@ -447,6 +454,7 @@ public class CamelNettyhttpSinkConnectorConfig
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MIN_IDLE_CONF, ConfigDef.Type.INT, CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MIN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MIN_IDLE_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_UDP_CONNECTIONLESS_SENDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_COMPONENT_UDP_CONNECTIONLESS_SENDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_UDP_CONNECTIONLESS_SENDING_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_USE_BYTE_BUF_DOC);
+        conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_NETTYHTTP_COMPONENT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_NETTYHTTP_COMPONENT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTYHTTP_COMPONENT_CHANNEL_GROUP_DOC);
diff --git a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSourceConnectorConfig.java b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSourceConnectorConfig.java
index 1da1aa7..d75bf26 100644
--- a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSourceConnectorConfig.java
+++ b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSourceConnectorConfig.java
@@ -134,6 +134,9 @@ public class CamelNettyhttpSourceConnectorConfig
     public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_CONF = "camel.source.endpoint.usingExecutorService";
     public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_DOC = "Whether to use ordered thread pool, to ensure events are processed orderly on the same channel.";
     public static final Boolean CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_CONF = "camel.source.endpoint.hostnameVerification";
+    public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.source.endpoint.allowSerializedHeaders";
     public static final String CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -308,6 +311,9 @@ public class CamelNettyhttpSourceConnectorConfig
     public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_CONF = "camel.component.netty-http.usingExecutorService";
     public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_DOC = "Whether to use ordered thread pool, to ensure events are processed orderly on the same channel.";
     public static final Boolean CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_CONF = "camel.component.netty-http.hostnameVerification";
+    public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.component.netty-http.allowSerializedHeaders";
     public static final String CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -468,6 +474,7 @@ public class CamelNettyhttpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_TRACE_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_URL_DECODE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_URL_DECODE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_URL_DECODE_HEADERS_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_USING_EXECUTOR_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CHANNEL_GROUP_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_ENDPOINT_CONFIGURATION_DOC);
@@ -526,6 +533,7 @@ public class CamelNettyhttpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_INITIALIZER_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_INITIALIZER_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_SERVER_INITIALIZER_FACTORY_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_USING_EXECUTOR_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_NETTYHTTP_COMPONENT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTYHTTP_COMPONENT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTYHTTP_COMPONENT_CHANNEL_GROUP_DOC);
diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
index 04d72ab..7bcdce9 100644
--- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
+++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
@@ -160,6 +160,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.hostnameVerification": {
+			"name": "camel.sink.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.allowSerializedHeaders": {
 			"name": "camel.sink.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -506,6 +513,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty.hostnameVerification": {
+			"name": "camel.component.netty.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty.allowSerializedHeaders": {
 			"name": "camel.component.netty.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json
index 6a7e1ba..171e4aa 100644
--- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json
+++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json
@@ -221,6 +221,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.hostnameVerification": {
+			"name": "camel.source.endpoint.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.allowSerializedHeaders": {
 			"name": "camel.source.endpoint.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
@@ -630,6 +637,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty.hostnameVerification": {
+			"name": "camel.component.netty.hostnameVerification",
+			"description": "To enable\/disable hostname verification on SSLEngine",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty.allowSerializedHeaders": {
 			"name": "camel.component.netty.allowSerializedHeaders",
 			"description": "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.",
diff --git a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc
index 39d68f8..3cd0dc3 100644
--- a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc
+++ b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.netty.CamelNettySinkConnector
 ----
 
 
-The camel-netty sink connector supports 107 options, which are listed below.
+The camel-netty sink connector supports 109 options, which are listed below.
 
 
 
@@ -53,6 +53,7 @@ The camel-netty sink connector supports 107 options, which are listed below.
 | *camel.sink.endpoint.producerPoolMinIdle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | null | false | MEDIUM
 | *camel.sink.endpoint.udpConnectionlessSending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | false | MEDIUM
 | *camel.sink.endpoint.useByteBuf* | If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out. | false | false | MEDIUM
+| *camel.sink.endpoint.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.sink.endpoint.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.sink.endpoint.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
 | *camel.sink.endpoint.nativeTransport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | false | MEDIUM
@@ -105,6 +106,7 @@ The camel-netty sink connector supports 107 options, which are listed below.
 | *camel.component.netty.producerPoolMinIdle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | null | false | MEDIUM
 | *camel.component.netty.udpConnectionlessSending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | false | MEDIUM
 | *camel.component.netty.useByteBuf* | If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out. | false | false | MEDIUM
+| *camel.component.netty.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.component.netty.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.component.netty.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.netty.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
diff --git a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc
index ad91475..07a8199 100644
--- a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc
+++ b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.netty.CamelNettySourceConnector
 ----
 
 
-The camel-netty source connector supports 119 options, which are listed below.
+The camel-netty source connector supports 121 options, which are listed below.
 
 
 
@@ -58,6 +58,7 @@ The camel-netty source connector supports 119 options, which are listed below.
 | *camel.source.endpoint.serverExceptionCaughtLog Level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "WARN" | false | MEDIUM
 | *camel.source.endpoint.serverInitializerFactory* | To use a custom ServerInitializerFactory | null | false | MEDIUM
 | *camel.source.endpoint.usingExecutorService* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | false | MEDIUM
+| *camel.source.endpoint.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.source.endpoint.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.source.endpoint.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
 | *camel.source.endpoint.nativeTransport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | false | MEDIUM
@@ -116,6 +117,7 @@ The camel-netty source connector supports 119 options, which are listed below.
 | *camel.component.netty.serverExceptionCaughtLog Level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "WARN" | false | MEDIUM
 | *camel.component.netty.serverInitializerFactory* | To use a custom ServerInitializerFactory | null | false | MEDIUM
 | *camel.component.netty.usingExecutorService* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | false | MEDIUM
+| *camel.component.netty.hostnameVerification* | To enable/disable hostname verification on SSLEngine | false | false | MEDIUM
 | *camel.component.netty.allowSerializedHeaders* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | false | MEDIUM
 | *camel.component.netty.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.netty.channelGroup* | To use a explicit ChannelGroup. | null | false | MEDIUM
diff --git a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
index 1cc2d98..1575e80 100644
--- a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
+++ b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
@@ -90,6 +90,9 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_CONF = "camel.sink.endpoint.useByteBuf";
     public static final String CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_DOC = "If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out.";
     public static final Boolean CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_DEFAULT = false;
+    public static final String CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_CONF = "camel.sink.endpoint.hostnameVerification";
+    public static final String CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.sink.endpoint.allowSerializedHeaders";
     public static final String CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -246,6 +249,9 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_CONF = "camel.component.netty.useByteBuf";
     public static final String CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_DOC = "If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out.";
     public static final Boolean CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_DEFAULT = false;
+    public static final String CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_CONF = "camel.component.netty.hostnameVerification";
+    public static final String CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.component.netty.allowSerializedHeaders";
     public static final String CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -380,6 +386,7 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MIN_IDLE_CONF, ConfigDef.Type.INT, CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MIN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MIN_IDLE_DOC);
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_UDP_CONNECTIONLESS_SENDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_ENDPOINT_UDP_CONNECTIONLESS_SENDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_UDP_CONNECTIONLESS_SENDING_DOC);
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_USE_BYTE_BUF_DOC);
+        conf.define(CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_NETTY_ENDPOINT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_CHANNEL_GROUP_DOC);
         conf.define(CAMEL_SINK_NETTY_ENDPOINT_NATIVE_TRANSPORT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_ENDPOINT_NATIVE_TRANSPORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_ENDPOINT_NATIVE_TRANSPORT_DOC);
@@ -432,6 +439,7 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MIN_IDLE_CONF, ConfigDef.Type.INT, CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MIN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MIN_IDLE_DOC);
         conf.define(CAMEL_SINK_NETTY_COMPONENT_UDP_CONNECTIONLESS_SENDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_COMPONENT_UDP_CONNECTIONLESS_SENDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_UDP_CONNECTIONLESS_SENDING_DOC);
         conf.define(CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_USE_BYTE_BUF_DOC);
+        conf.define(CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SINK_NETTY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_NETTY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_NETTY_COMPONENT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_NETTY_COMPONENT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_NETTY_COMPONENT_CHANNEL_GROUP_DOC);
diff --git a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySourceConnectorConfig.java b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySourceConnectorConfig.java
index cb72ef4..bcb1a1c 100644
--- a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySourceConnectorConfig.java
+++ b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySourceConnectorConfig.java
@@ -107,6 +107,9 @@ public class CamelNettySourceConnectorConfig
     public static final String CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_CONF = "camel.source.endpoint.usingExecutorService";
     public static final String CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_DOC = "Whether to use ordered thread pool, to ensure events are processed orderly on the same channel.";
     public static final Boolean CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_CONF = "camel.source.endpoint.hostnameVerification";
+    public static final String CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.source.endpoint.allowSerializedHeaders";
     public static final String CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -281,6 +284,9 @@ public class CamelNettySourceConnectorConfig
     public static final String CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_CONF = "camel.component.netty.usingExecutorService";
     public static final String CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_DOC = "Whether to use ordered thread pool, to ensure events are processed orderly on the same channel.";
     public static final Boolean CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_CONF = "camel.component.netty.hostnameVerification";
+    public static final String CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DOC = "To enable/disable hostname verification on SSLEngine";
+    public static final Boolean CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT = false;
     public static final String CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF = "camel.component.netty.allowSerializedHeaders";
     public static final String CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC = "Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level.";
     public static final Boolean CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT = false;
@@ -423,6 +429,7 @@ public class CamelNettySourceConnectorConfig
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DOC);
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_INITIALIZER_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_INITIALIZER_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_SERVER_INITIALIZER_FACTORY_DOC);
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_USING_EXECUTOR_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_ENDPOINT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_CHANNEL_GROUP_DOC);
         conf.define(CAMEL_SOURCE_NETTY_ENDPOINT_NATIVE_TRANSPORT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_ENDPOINT_NATIVE_TRANSPORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_ENDPOINT_NATIVE_TRANSPORT_DOC);
@@ -481,6 +488,7 @@ public class CamelNettySourceConnectorConfig
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_SERVER_EXCEPTION_CAUGHT_LOG_LEVEL_DOC);
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_SERVER_INITIALIZER_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_COMPONENT_SERVER_INITIALIZER_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_SERVER_INITIALIZER_FACTORY_DOC);
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_USING_EXECUTOR_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_HOSTNAME_VERIFICATION_DOC);
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_ALLOW_SERIALIZED_HEADERS_DOC);
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_NETTY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_NETTY_COMPONENT_CHANNEL_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_NETTY_COMPONENT_CHANNEL_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_NETTY_COMPONENT_CHANNEL_GROUP_DOC);
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
index 5b0694f..86ec319 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
@@ -58,7 +58,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -154,30 +154,23 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.headerFilterStrategy": {
-			"name": "camel.sink.endpoint.headerFilterStrategy",
-			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
-			"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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
+		"camel.sink.endpoint.headerFilterStrategy": {
+			"name": "camel.sink.endpoint.headerFilterStrategy",
+			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -218,6 +211,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.copyHeaders": {
+			"name": "camel.component.resteasy.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.lazyStartProducer": {
 			"name": "camel.component.resteasy.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 [...]
@@ -225,6 +225,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.responsePayloadStreamingThreshold": {
+			"name": "camel.component.resteasy.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipRequestHeaders": {
+			"name": "camel.component.resteasy.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipResponseHeaders": {
+			"name": "camel.component.resteasy.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.allowJavaSerializedObject": {
 			"name": "camel.component.resteasy.allowJavaSerializedObject",
 			"description": "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.",
@@ -232,6 +253,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -239,6 +274,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
index c5f6739..a7d40dc 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
@@ -113,26 +113,6 @@
 				"InOptionalOut"
 			]
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.headerFilterStrategy": {
-			"name": "camel.source.endpoint.headerFilterStrategy",
-			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
-			"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.",
@@ -154,6 +134,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.headerFilterStrategy": {
+			"name": "camel.source.endpoint.headerFilterStrategy",
+			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.setHttpResponseDuringProcessing": {
 			"name": "camel.source.endpoint.setHttpResponseDuringProcessing",
 			"description": "Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy.",
@@ -211,6 +211,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -218,6 +232,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
index 276d0a5..47ca60f 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
+++ b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySinkConnec
 ----
 
 
-The camel-resteasy sink connector supports 34 options, which are listed below.
+The camel-resteasy sink connector supports 44 options, which are listed below.
 
 
 
@@ -38,7 +38,7 @@ The camel-resteasy sink connector supports 34 options, which are listed below.
 | *camel.sink.endpoint.servletName* | Sets the servlet name | null | 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. On the producer side the exception will be deserialized and thrown as is, instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deseria [...]
 | *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.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -51,19 +51,29 @@ The camel-resteasy sink connector supports 34 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | null | 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.setHttpResponseDuring Processing* | Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy. | null | false | MEDIUM
 | *camel.sink.endpoint.skipServletProcessing* | Sets the flag to use skip servlet processing and let camel take over processing | null | false | MEDIUM
 | *camel.sink.endpoint.useSystemProperties* | To use System Properties as fallback for configuration | false | false | MEDIUM
 | *camel.sink.endpoint.proxyClientClass* | Sets the resteasy proxyClientClass | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Sets the password | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Sets the username | null | false | MEDIUM
+| *camel.component.resteasy.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.resteasy.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.resteasy.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | 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-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
index 08dba39..5e30a30 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
+++ b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySourceConn
 ----
 
 
-The camel-resteasy source connector supports 32 options, which are listed below.
+The camel-resteasy source connector supports 39 options, which are listed below.
 
 
 
@@ -46,12 +46,12 @@ The camel-resteasy source connector supports 32 options, which are listed below.
 | *camel.source.endpoint.eagerCheckContentAvailable* | Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present. This can be turned on in case HTTP clients do not send streamed data. | 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.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.headerFilterStrategy* | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | null | 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
+| *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.headerFilterStrategy* | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.source.endpoint.setHttpResponseDuring Processing* | Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy. | null | false | MEDIUM
 | *camel.source.endpoint.skipServletProcessing* | Sets the flag to use skip servlet processing and let camel take over processing | null | false | MEDIUM
 | *camel.source.endpoint.useSystemProperties* | To use System Properties as fallback for configuration | false | false | MEDIUM
@@ -61,7 +61,14 @@ The camel-resteasy source connector supports 32 options, which are listed below.
 | *camel.component.resteasy.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.resteasy.proxyConsumersClasses* | Proxy classes for consumer endpoints. Multiple classes can be separated by comma. | null | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | 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-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
index b389c73..a6c2536 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
+++ b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
@@ -48,7 +48,7 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_BRIDGE_ENDPOINT_DOC = "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.";
     public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_BRIDGE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -86,18 +86,15 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.sink.endpoint.headerFilterStrategy";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.sink.endpoint.mapHttpMessageBody";
-    public static final String CAMEL_SINK_RESTEASY_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_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF = "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody";
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC = "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.";
-    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT = true;
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.sink.endpoint.mapHttpMessageHeaders";
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
-    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_CONF = "camel.sink.endpoint.setHttpResponseDuringProcessing";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DOC = "Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy.";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DEFAULT = null;
@@ -116,15 +113,48 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DOC = "Sets the username";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_CONF = "camel.component.resteasy.copyHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.resteasy.lazyStartProducer";
     public static final String CAMEL_SINK_RESTEASY_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_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.resteasy.responsePayloadStreamingThreshold";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
+    public static final Integer CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.resteasy.skipRequestHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.resteasy.skipResponseHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.resteasy.allowJavaSerializedObject";
     public static final String CAMEL_SINK_RESTEASY_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_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.resteasy.authCachingDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.resteasy.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.resteasy.autowiredEnabled";
     public static final String CAMEL_SINK_RESTEASY_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_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.resteasy.connectionStateDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.resteasy.contentCompressionDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.resteasy.cookieManagementDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.resteasy.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.resteasy.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.resteasy.headerFilterStrategy";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -161,19 +191,29 @@ public class CamelResteasySinkConnectorConfig
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
-        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
-        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
-        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         return conf;
     }
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
index 6f489b6..a4a15f8 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
+++ b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
@@ -71,15 +71,6 @@ public class CamelResteasySourceConnectorConfig
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
-    public static final Boolean CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
-    public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.source.endpoint.headerFilterStrategy";
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.";
-    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.source.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -89,6 +80,15 @@ public class CamelResteasySourceConnectorConfig
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.source.endpoint.mapHttpMessageHeaders";
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
     public static final Boolean CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
+    public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.source.endpoint.headerFilterStrategy";
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.";
+    public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_CONF = "camel.source.endpoint.setHttpResponseDuringProcessing";
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DOC = "Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy.";
     public static final String CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DEFAULT = null;
@@ -116,9 +116,30 @@ public class CamelResteasySourceConnectorConfig
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.resteasy.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.resteasy.authCachingDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.resteasy.automaticRetriesDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.resteasy.autowiredEnabled";
     public static final String CAMEL_SOURCE_RESTEASY_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_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.resteasy.connectionStateDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.resteasy.contentCompressionDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.resteasy.cookieManagementDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.resteasy.defaultUserAgentDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.resteasy.redirectHandlingDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.resteasy.headerFilterStrategy";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -150,12 +171,12 @@ public class CamelResteasySourceConnectorConfig
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_EAGER_CHECK_CONTENT_AVAILABLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_EAGER_CHECK_CONTENT_AVAILABLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_EAGER_CHECK_CONTENT_AVAILABLE_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_OPTIONS_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_TRACE_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC);
@@ -165,7 +186,14 @@ public class CamelResteasySourceConnectorConfig
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         return conf;
     }
diff --git a/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-source.json b/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-source.json
index 85ffb87..f6b2d2c 100644
--- a/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-source.json
+++ b/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-source.json
@@ -132,20 +132,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -167,6 +153,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.servlet.bridgeErrorHandler": {
 			"name": "camel.component.servlet.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-servlet-kafka-connector/src/main/docs/camel-servlet-kafka-source-connector.adoc b/connectors/camel-servlet-kafka-connector/src/main/docs/camel-servlet-kafka-source-connector.adoc
index 4d0ab37..ef03d43 100644
--- a/connectors/camel-servlet-kafka-connector/src/main/docs/camel-servlet-kafka-source-connector.adoc
+++ b/connectors/camel-servlet-kafka-connector/src/main/docs/camel-servlet-kafka-source-connector.adoc
@@ -49,11 +49,11 @@ The camel-servlet source connector supports 33 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.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.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
+| *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.component.servlet.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.servlet.servletName* | Default name of servlet to use. The default name is CamelServlet. | "CamelServlet" | false | MEDIUM
 | *camel.component.servlet.attachmentMultipartBinding* | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | false | false | MEDIUM
diff --git a/connectors/camel-servlet-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/servlet/CamelServletSourceConnectorConfig.java b/connectors/camel-servlet-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/servlet/CamelServletSourceConnectorConfig.java
index 82005ce..e352814 100644
--- a/connectors/camel-servlet-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/servlet/CamelServletSourceConnectorConfig.java
+++ b/connectors/camel-servlet-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/servlet/CamelServletSourceConnectorConfig.java
@@ -80,12 +80,6 @@ public class CamelServletSourceConnectorConfig
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_CONF = "camel.source.endpoint.fileNameExtWhitelist";
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DOC = "Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml.";
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
-    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
-    public static final Boolean CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
-    public static final String CAMEL_SOURCE_SERVLET_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_SERVLET_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.source.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SOURCE_SERVLET_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_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -95,6 +89,12 @@ public class CamelServletSourceConnectorConfig
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF = "camel.source.endpoint.mapHttpMessageHeaders";
     public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC = "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.";
     public static final Boolean CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_CONF = "camel.source.endpoint.optionsEnabled";
+    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DOC = "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.";
+    public static final Boolean CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
+    public static final String CAMEL_SOURCE_SERVLET_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_SERVLET_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_SERVLET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.servlet.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_SERVLET_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 ig [...]
     public static final Boolean CAMEL_SOURCE_SERVLET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
@@ -156,11 +156,11 @@ public class CamelServletSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SERVLET_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SERVLET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DOC);
-        conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
+        conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_OPTIONS_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_ENDPOINT_TRACE_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_COMPONENT_SERVLET_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SERVLET_COMPONENT_SERVLET_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_COMPONENT_SERVLET_NAME_DOC);
         conf.define(CAMEL_SOURCE_SERVLET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SERVLET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SERVLET_COMPONENT_ATTACHMENT_MULTIPART_BINDING_DOC);
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
index c1a9e38..7f21500 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.token": {
+			"name": "camel.sink.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.iconEmoji": {
 			"name": "camel.sink.endpoint.iconEmoji",
 			"description": "Use a Slack emoji as an avatar",
@@ -60,6 +66,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
index 4edf1c0..592bcec 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.token": {
+			"name": "camel.source.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -22,6 +28,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.conversationType": {
+			"name": "camel.source.endpoint.conversationType",
+			"description": "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]",
+			"defaultValue": "\"PUBLIC_CHANNEL\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"PUBLIC_CHANNEL",
+				"PRIVATE_CHANNEL",
+				"MPIM",
+				"IM"
+			]
+		},
 		"camel.source.endpoint.maxResults": {
 			"name": "camel.source.endpoint.maxResults",
 			"description": "The Max Result for the poll",
@@ -29,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.naturalOrder": {
+			"name": "camel.source.endpoint.naturalOrder",
+			"description": "Create exchanges in natural order (oldest to newest) or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
 			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
 			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
@@ -43,12 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.token": {
-			"name": "camel.source.endpoint.token",
-			"description": "The token to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -196,6 +216,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
index fe364f0..e23c945 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSinkConnector
 ----
 
 
-The camel-slack sink connector supports 9 options, which are listed below.
+The camel-slack sink connector supports 11 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.sink.endpoint.token* | The token to use | null | false | MEDIUM
 | *camel.sink.endpoint.iconEmoji* | Use a Slack emoji as an avatar | null | false | LOW
 | *camel.sink.endpoint.iconUrl* | The avatar that the component will use when sending message to a channel or user. | null | false | LOW
 | *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 [...]
@@ -39,6 +40,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 | *camel.sink.endpoint.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 | *camel.component.slack.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.slack.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.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
index c3501d7..3d842c7 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSourceConnector
 ----
 
 
-The camel-slack source connector supports 26 options, which are listed below.
+The camel-slack source connector supports 29 options, which are listed below.
 
 
 
@@ -32,11 +32,13 @@ The camel-slack source connector supports 26 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.source.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.source.endpoint.token* | The token to use | 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.conversationType* | Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM] | "PUBLIC_CHANNEL" | false | MEDIUM
 | *camel.source.endpoint.maxResults* | The Max Result for the poll | "10" | false | MEDIUM
+| *camel.source.endpoint.naturalOrder* | Create exchanges in natural order (oldest to newest) or not | false | false | MEDIUM
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.serverUrl* | The Server URL of the Slack instance | "https://slack.com" | false | MEDIUM
-| *camel.source.endpoint.token* | The token to use | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *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
@@ -56,6 +58,7 @@ The camel-slack 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.slack.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.slack.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.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
index 574bc71..d46d666 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
@@ -27,6 +27,9 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_CONF = "camel.sink.path.channel";
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_DOC = "The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user.";
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_DEFAULT = null;
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_CONF = "camel.sink.endpoint.token";
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_CONF = "camel.sink.endpoint.iconEmoji";
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DOC = "Use a Slack emoji as an avatar";
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DEFAULT = null;
@@ -48,6 +51,9 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.slack.autowiredEnabled";
     public static final String CAMEL_SINK_SLACK_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_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_CONF = "camel.component.slack.token";
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_CONF = "camel.component.slack.webhookUrl";
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DOC = "The incoming webhook URL";
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT = null;
@@ -65,6 +71,7 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_SLACK_PATH_CHANNEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_PATH_CHANNEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_SLACK_PATH_CHANNEL_DOC);
+        conf.define(CAMEL_SINK_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_DOC);
@@ -72,6 +79,7 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SINK_SLACK_COMPONENT_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_COMPONENT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_TOKEN_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DOC);
         return conf;
     }
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
index d4282cd..a2a63f5 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
@@ -29,21 +29,27 @@ public class CamelSlackSourceConnectorConfig
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_CONF = "camel.source.path.channel";
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_DOC = "The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user.";
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF = "camel.source.endpoint.token";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_CONF = "camel.source.endpoint.conversationType";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DOC = "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DEFAULT = "PUBLIC_CHANNEL";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_CONF = "camel.source.endpoint.maxResults";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DOC = "The Max Result for the poll";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DEFAULT = "10";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_CONF = "camel.source.endpoint.naturalOrder";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DOC = "Create exchanges in natural order (oldest to newest) or not";
+    public static final Boolean CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF = "camel.source.endpoint.sendEmptyMessageWhenIdle";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.";
     public static final Boolean CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT = false;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_CONF = "camel.source.endpoint.serverUrl";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DOC = "The Server URL of the Slack instance";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DEFAULT = "https://slack.com";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF = "camel.source.endpoint.token";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -101,6 +107,9 @@ public class CamelSlackSourceConnectorConfig
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.slack.autowiredEnabled";
     public static final String CAMEL_SOURCE_SLACK_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_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_CONF = "camel.component.slack.token";
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_CONF = "camel.component.slack.webhookUrl";
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DOC = "The incoming webhook URL";
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT = null;
@@ -118,11 +127,13 @@ public class CamelSlackSourceConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_SLACK_PATH_CHANNEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_PATH_CHANNEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_SLACK_PATH_CHANNEL_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DOC);
-        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_DOC);
@@ -142,6 +153,7 @@ public class CamelSlackSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DOC);
         return conf;
     }
diff --git a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-sink.json b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-sink.json
index 62009a2..58811e0 100644
--- a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-sink.json
+++ b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-sink.json
@@ -245,7 +245,7 @@
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -572,7 +572,7 @@
 		"camel.component.smpp.enquireLinkTimer": {
 			"name": "camel.component.smpp.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-source.json b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-source.json
index 421d6c9..6c65033 100644
--- a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-source.json
+++ b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-source.json
@@ -95,7 +95,7 @@
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -255,7 +255,7 @@
 		"camel.component.smpp.enquireLinkTimer": {
 			"name": "camel.component.smpp.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-sink-connector.adoc b/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-sink-connector.adoc
index ed79133..76fdff8 100644
--- a/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-sink-connector.adoc
+++ b/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-sink-connector.adoc
@@ -53,7 +53,7 @@ The camel-smpp sink connector supports 72 options, which are listed below.
 | *camel.sink.endpoint.sourceAddrNpi* | Defines the numeric plan indicator (NPI) to be used in the SME originator address parameters. The following NPI values are defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet (IP) 18: WAP Client Id (to be defined by WAP Forum) One of: [0] [1] [2] [3] [6] [8] [9] [10] [13] [18] | null | false | MEDIUM
 | *camel.sink.endpoint.sourceAddrTon* | Defines the type of number (TON) to be used in the SME originator address parameters. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
 | *camel.sink.endpoint.typeOfNumber* | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
-| *camel.sink.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.sink.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.sink.endpoint.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.sink.endpoint.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.sink.endpoint.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
@@ -89,7 +89,7 @@ The camel-smpp sink connector supports 72 options, which are listed below.
 | *camel.component.smpp.typeOfNumber* | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
 | *camel.component.smpp.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.smpp.configuration* | To use the shared SmppConfiguration as configuration. | null | false | MEDIUM
-| *camel.component.smpp.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.component.smpp.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.component.smpp.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.component.smpp.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.component.smpp.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
diff --git a/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-source-connector.adoc b/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-source-connector.adoc
index 8700c6c..93c0f8f 100644
--- a/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-source-connector.adoc
+++ b/connectors/camel-smpp-kafka-connector/src/main/docs/camel-smpp-kafka-source-connector.adoc
@@ -42,7 +42,7 @@ The camel-smpp source connector supports 48 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.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.source.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.source.endpoint.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.source.endpoint.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.source.endpoint.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
@@ -65,7 +65,7 @@ The camel-smpp source connector supports 48 options, which are listed below.
 | *camel.component.smpp.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.smpp.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.smpp.configuration* | To use the shared SmppConfiguration as configuration. | null | false | MEDIUM
-| *camel.component.smpp.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.component.smpp.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.component.smpp.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.component.smpp.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.component.smpp.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
diff --git a/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSinkConnectorConfig.java b/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSinkConnectorConfig.java
index 1ec9bfe..70fd585 100644
--- a/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSinkConnectorConfig.java
+++ b/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSinkConnectorConfig.java
@@ -92,7 +92,7 @@ public class CamelSmppSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SMPP_ENDPOINT_TYPE_OF_NUMBER_DEFAULT = null;
     public static final String CAMEL_SINK_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_CONF = "camel.sink.endpoint.enquireLinkTimer";
     public static final String CAMEL_SINK_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SINK_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SINK_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SINK_SMPP_ENDPOINT_SESSION_STATE_LISTENER_CONF = "camel.sink.endpoint.sessionStateListener";
     public static final String CAMEL_SINK_SMPP_ENDPOINT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SINK_SMPP_ENDPOINT_SESSION_STATE_LISTENER_DEFAULT = null;
@@ -200,7 +200,7 @@ public class CamelSmppSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SMPP_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SINK_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_CONF = "camel.component.smpp.enquireLinkTimer";
     public static final String CAMEL_SINK_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SINK_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SINK_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SINK_SMPP_COMPONENT_SESSION_STATE_LISTENER_CONF = "camel.component.smpp.sessionStateListener";
     public static final String CAMEL_SINK_SMPP_COMPONENT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SINK_SMPP_COMPONENT_SESSION_STATE_LISTENER_DEFAULT = null;
diff --git a/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSourceConnectorConfig.java b/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSourceConnectorConfig.java
index 3860a0b..966b10e 100644
--- a/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSourceConnectorConfig.java
+++ b/connectors/camel-smpp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpp/CamelSmppSourceConnectorConfig.java
@@ -61,7 +61,7 @@ public class CamelSmppSourceConnectorConfig
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_CONF = "camel.source.endpoint.enquireLinkTimer";
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SOURCE_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SOURCE_SMPP_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_SESSION_STATE_LISTENER_CONF = "camel.source.endpoint.sessionStateListener";
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SOURCE_SMPP_ENDPOINT_SESSION_STATE_LISTENER_DEFAULT = null;
@@ -130,7 +130,7 @@ public class CamelSmppSourceConnectorConfig
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_CONF = "camel.component.smpp.enquireLinkTimer";
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SOURCE_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SOURCE_SMPP_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_SESSION_STATE_LISTENER_CONF = "camel.component.smpp.sessionStateListener";
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SOURCE_SMPP_COMPONENT_SESSION_STATE_LISTENER_DEFAULT = null;
diff --git a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-sink.json b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-sink.json
index 60fe602..8fc351d 100644
--- a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-sink.json
+++ b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-sink.json
@@ -245,7 +245,7 @@
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -572,7 +572,7 @@
 		"camel.component.smpps.enquireLinkTimer": {
 			"name": "camel.component.smpps.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-source.json b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-source.json
index 1c66806..a139ac5 100644
--- a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-source.json
+++ b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-source.json
@@ -95,7 +95,7 @@
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -255,7 +255,7 @@
 		"camel.component.smpps.enquireLinkTimer": {
 			"name": "camel.component.smpps.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
-			"defaultValue": "\"5000\"",
+			"defaultValue": "\"60000\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-sink-connector.adoc b/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-sink-connector.adoc
index d5f7a16..8455ad3 100644
--- a/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-sink-connector.adoc
+++ b/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-sink-connector.adoc
@@ -53,7 +53,7 @@ The camel-smpps sink connector supports 72 options, which are listed below.
 | *camel.sink.endpoint.sourceAddrNpi* | Defines the numeric plan indicator (NPI) to be used in the SME originator address parameters. The following NPI values are defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex (F.69) 6: Land Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet (IP) 18: WAP Client Id (to be defined by WAP Forum) One of: [0] [1] [2] [3] [6] [8] [9] [10] [13] [18] | null | false | MEDIUM
 | *camel.sink.endpoint.sourceAddrTon* | Defines the type of number (TON) to be used in the SME originator address parameters. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
 | *camel.sink.endpoint.typeOfNumber* | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
-| *camel.sink.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.sink.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.sink.endpoint.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.sink.endpoint.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.sink.endpoint.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
@@ -89,7 +89,7 @@ The camel-smpps sink connector supports 72 options, which are listed below.
 | *camel.component.smpps.typeOfNumber* | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated One of: [0] [1] [2] [3] [4] [5] [6] | null | false | MEDIUM
 | *camel.component.smpps.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.smpps.configuration* | To use the shared SmppConfiguration as configuration. | null | false | MEDIUM
-| *camel.component.smpps.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.component.smpps.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.component.smpps.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.component.smpps.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.component.smpps.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
diff --git a/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-source-connector.adoc b/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-source-connector.adoc
index 36b5a08..d2079c3 100644
--- a/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-source-connector.adoc
+++ b/connectors/camel-smpps-kafka-connector/src/main/docs/camel-smpps-kafka-source-connector.adoc
@@ -42,7 +42,7 @@ The camel-smpps source connector supports 48 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.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.source.endpoint.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.source.endpoint.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.source.endpoint.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.source.endpoint.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
@@ -65,7 +65,7 @@ The camel-smpps source connector supports 48 options, which are listed below.
 | *camel.component.smpps.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.smpps.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.smpps.configuration* | To use the shared SmppConfiguration as configuration. | null | false | MEDIUM
-| *camel.component.smpps.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "5000" | false | MEDIUM
+| *camel.component.smpps.enquireLinkTimer* | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | "60000" | false | MEDIUM
 | *camel.component.smpps.sessionStateListener* | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | null | false | MEDIUM
 | *camel.component.smpps.transactionTimer* | Defines the maximum period of inactivity allowed after a transaction, after which an SMPP entity may assume that the session is no longer active. This timer may be active on either communicating SMPP entity (i.e. SMSC or ESME). | "10000" | false | MEDIUM
 | *camel.component.smpps.alphabet* | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet One of: [0] [4] [8] | null | false | MEDIUM
diff --git a/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSinkConnectorConfig.java b/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSinkConnectorConfig.java
index bff668c..9004755 100644
--- a/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSinkConnectorConfig.java
+++ b/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSinkConnectorConfig.java
@@ -92,7 +92,7 @@ public class CamelSmppsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_TYPE_OF_NUMBER_DEFAULT = null;
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_CONF = "camel.sink.endpoint.enquireLinkTimer";
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SINK_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SINK_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_CONF = "camel.sink.endpoint.sessionStateListener";
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SINK_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_DEFAULT = null;
@@ -200,7 +200,7 @@ public class CamelSmppsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SMPPS_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SINK_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_CONF = "camel.component.smpps.enquireLinkTimer";
     public static final String CAMEL_SINK_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SINK_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SINK_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SINK_SMPPS_COMPONENT_SESSION_STATE_LISTENER_CONF = "camel.component.smpps.sessionStateListener";
     public static final String CAMEL_SINK_SMPPS_COMPONENT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SINK_SMPPS_COMPONENT_SESSION_STATE_LISTENER_DEFAULT = null;
diff --git a/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSourceConnectorConfig.java b/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSourceConnectorConfig.java
index fe63ce1..9f4e2f1 100644
--- a/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSourceConnectorConfig.java
+++ b/connectors/camel-smpps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/smpps/CamelSmppsSourceConnectorConfig.java
@@ -61,7 +61,7 @@ public class CamelSmppsSourceConnectorConfig
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_CONF = "camel.source.endpoint.enquireLinkTimer";
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_CONF = "camel.source.endpoint.sessionStateListener";
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SOURCE_SMPPS_ENDPOINT_SESSION_STATE_LISTENER_DEFAULT = null;
@@ -130,7 +130,7 @@ public class CamelSmppsSourceConnectorConfig
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_CONF = "camel.component.smpps.enquireLinkTimer";
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DOC = "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.";
-    public static final String CAMEL_SOURCE_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "5000";
+    public static final String CAMEL_SOURCE_SMPPS_COMPONENT_ENQUIRE_LINK_TIMER_DEFAULT = "60000";
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_SESSION_STATE_LISTENER_CONF = "camel.component.smpps.sessionStateListener";
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_SESSION_STATE_LISTENER_DOC = "You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed.";
     public static final String CAMEL_SOURCE_SMPPS_COMPONENT_SESSION_STATE_LISTENER_DEFAULT = null;
diff --git a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-sink.json b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-sink.json
index ea74960..f8c5ec6 100644
--- a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-sink.json
+++ b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-sink.json
@@ -93,6 +93,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.tcpReceiverLocalPort": {
+			"name": "camel.sink.endpoint.tcpReceiverLocalPort",
+			"description": "Splunk tcp receiver port defined locally on splunk server. (For example if splunk port 9997 is mapped to 12345, tcpReceiverLocalPort has to be 9997)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.tcpReceiverPort": {
 			"name": "camel.sink.endpoint.tcpReceiverPort",
 			"description": "Splunk tcp receiver port",
diff --git a/connectors/camel-splunk-kafka-connector/src/main/docs/camel-splunk-kafka-sink-connector.adoc b/connectors/camel-splunk-kafka-connector/src/main/docs/camel-splunk-kafka-sink-connector.adoc
index b861356..e12af50 100644
--- a/connectors/camel-splunk-kafka-connector/src/main/docs/camel-splunk-kafka-sink-connector.adoc
+++ b/connectors/camel-splunk-kafka-connector/src/main/docs/camel-splunk-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.splunk.CamelSplunkSinkConnector
 ----
 
 
-The camel-splunk sink connector supports 21 options, which are listed below.
+The camel-splunk sink connector supports 22 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The camel-splunk sink connector supports 21 options, which are listed below.
 | *camel.sink.endpoint.raw* | Should the payload be inserted raw | false | false | MEDIUM
 | *camel.sink.endpoint.source* | Splunk source argument | null | false | MEDIUM
 | *camel.sink.endpoint.sourceType* | Splunk sourcetype argument | null | false | MEDIUM
+| *camel.sink.endpoint.tcpReceiverLocalPort* | Splunk tcp receiver port defined locally on splunk server. (For example if splunk port 9997 is mapped to 12345, tcpReceiverLocalPort has to be 9997) | null | false | MEDIUM
 | *camel.sink.endpoint.tcpReceiverPort* | Splunk tcp receiver port | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Password for Splunk | null | false | MEDIUM
 | *camel.sink.endpoint.sslProtocol* | Set the ssl protocol to use One of: [TLSv1.2] [TLSv1.1] [TLSv1] [SSLv3] | "TLSv1.2" | false | MEDIUM
diff --git a/connectors/camel-splunk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/splunk/CamelSplunkSinkConnectorConfig.java b/connectors/camel-splunk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/splunk/CamelSplunkSinkConnectorConfig.java
index e7d07b4..f1c941e 100644
--- a/connectors/camel-splunk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/splunk/CamelSplunkSinkConnectorConfig.java
+++ b/connectors/camel-splunk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/splunk/CamelSplunkSinkConnectorConfig.java
@@ -63,6 +63,9 @@ public class CamelSplunkSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_CONF = "camel.sink.endpoint.sourceType";
     public static final String CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_DOC = "Splunk sourcetype argument";
     public static final String CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_DEFAULT = null;
+    public static final String CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_CONF = "camel.sink.endpoint.tcpReceiverLocalPort";
+    public static final String CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_DOC = "Splunk tcp receiver port defined locally on splunk server. (For example if splunk port 9997 is mapped to 12345, tcpReceiverLocalPort has to be 9997)";
+    public static final String CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_DEFAULT = null;
     public static final String CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_CONF = "camel.sink.endpoint.tcpReceiverPort";
     public static final String CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_DOC = "Splunk tcp receiver port";
     public static final Integer CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_DEFAULT = null;
@@ -113,6 +116,7 @@ public class CamelSplunkSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_RAW_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPLUNK_ENDPOINT_RAW_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_RAW_DOC);
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_DOC);
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_SOURCE_TYPE_DOC);
+        conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_LOCAL_PORT_DOC);
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_TCP_RECEIVER_PORT_DOC);
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_SPLUNK_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_SPLUNK_ENDPOINT_SSL_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPLUNK_ENDPOINT_SSL_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPLUNK_ENDPOINT_SSL_PROTOCOL_DOC);
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json
index b3b495c..955b8fd 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json
@@ -106,6 +106,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.allowNullBody": {
+			"name": "camel.component.spring-rabbitmq.allowNullBody",
+			"description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.lazyStartProducer": {
 			"name": "camel.component.spring-rabbitmq.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 [...]
@@ -113,6 +120,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.replyTimeout": {
+			"name": "camel.component.spring-rabbitmq.replyTimeout",
+			"description": "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request\/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout.",
+			"defaultValue": "5000L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.autowiredEnabled": {
 			"name": "camel.component.spring-rabbitmq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json
index 928e594..901ae4f 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json
@@ -131,6 +131,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.maximumRetryAttempts": {
+			"name": "camel.source.endpoint.maximumRetryAttempts",
+			"description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message",
+			"defaultValue": "5",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.noLocal": {
 			"name": "camel.source.endpoint.noLocal",
 			"description": "Set to true for an no-local consumer",
@@ -144,6 +151,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.rejectAndDontRequeue": {
+			"name": "camel.source.endpoint.rejectAndDontRequeue",
+			"description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.retryDelay": {
+			"name": "camel.source.endpoint.retryDelay",
+			"description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process",
+			"defaultValue": "1000",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.concurrentConsumers": {
+			"name": "camel.source.endpoint.concurrentConsumers",
+			"description": "The number of consumers",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -161,6 +188,35 @@
 				"InOptionalOut"
 			]
 		},
+		"camel.source.endpoint.maxConcurrentConsumers": {
+			"name": "camel.source.endpoint.maxConcurrentConsumers",
+			"description": "The maximum number of consumers (available only with SMLC)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.messageListenerContainerType": {
+			"name": "camel.source.endpoint.messageListenerContainerType",
+			"description": "The type of the MessageListenerContainer One of: [DMLC] [SMLC]",
+			"defaultValue": "\"DMLC\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DMLC",
+				"SMLC"
+			]
+		},
+		"camel.source.endpoint.prefetchCount": {
+			"name": "camel.source.endpoint.prefetchCount",
+			"description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.retry": {
+			"name": "camel.source.endpoint.retry",
+			"description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.args": {
 			"name": "camel.source.endpoint.args",
 			"description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000",
@@ -257,6 +313,34 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.maximumRetryAttempts": {
+			"name": "camel.component.spring-rabbitmq.maximumRetryAttempts",
+			"description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message",
+			"defaultValue": "5",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.rejectAndDontRequeue": {
+			"name": "camel.component.spring-rabbitmq.rejectAndDontRequeue",
+			"description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.retryDelay": {
+			"name": "camel.component.spring-rabbitmq.retryDelay",
+			"description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process",
+			"defaultValue": "1000",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.concurrentConsumers": {
+			"name": "camel.component.spring-rabbitmq.concurrentConsumers",
+			"description": "The number of consumers",
+			"defaultValue": "1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.errorHandler": {
 			"name": "camel.component.spring-rabbitmq.errorHandler",
 			"description": "To use a custom ErrorHandler for handling exceptions from the message listener (consumer)",
@@ -269,6 +353,23 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.maxConcurrentConsumers": {
+			"name": "camel.component.spring-rabbitmq.maxConcurrentConsumers",
+			"description": "The maximum number of consumers (available only with SMLC)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.spring-rabbitmq.messageListenerContainerType": {
+			"name": "camel.component.spring-rabbitmq.messageListenerContainerType",
+			"description": "The type of the MessageListenerContainer One of: [DMLC] [SMLC]",
+			"defaultValue": "\"DMLC\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"DMLC",
+				"SMLC"
+			]
+		},
 		"camel.component.spring-rabbitmq.prefetchCount": {
 			"name": "camel.component.spring-rabbitmq.prefetchCount",
 			"description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput.",
@@ -276,6 +377,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.spring-rabbitmq.retry": {
+			"name": "camel.component.spring-rabbitmq.retry",
+			"description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.spring-rabbitmq.shutdownTimeout": {
 			"name": "camel.component.spring-rabbitmq.shutdownTimeout",
 			"description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout.",
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc
index f9ff55f..ac714a2 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit
 ----
 
 
-The camel-spring-rabbitmq sink connector supports 21 options, which are listed below.
+The camel-spring-rabbitmq sink connector supports 23 options, which are listed below.
 
 
 
@@ -46,7 +46,9 @@ The camel-spring-rabbitmq sink connector supports 21 options, which are listed b
 | *camel.component.spring-rabbitmq.amqpAdmin* | Optional AMQP Admin service to use for auto declaring elements (queues, exchanges, bindings) | null | false | MEDIUM
 | *camel.component.spring-rabbitmq.connectionFactory* | The connection factory to be use. A connection factory must be configured either on the component or endpoint. | null | false | MEDIUM
 | *camel.component.spring-rabbitmq.testConnectionOn Startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | false | MEDIUM
+| *camel.component.spring-rabbitmq.allowNullBody* | Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown. | false | false | MEDIUM
 | *camel.component.spring-rabbitmq.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 proces [...]
+| *camel.component.spring-rabbitmq.replyTimeout* | Specify the timeout in milliseconds to be used when waiting for a reply message when doing request/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout. | 5000L | false | MEDIUM
 | *camel.component.spring-rabbitmq.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.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM
 | *camel.component.spring-rabbitmq.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc
index a196246..58bb751 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit
 ----
 
 
-The camel-spring-rabbitmq source connector supports 43 options, which are listed below.
+The camel-spring-rabbitmq source connector supports 58 options, which are listed below.
 
 
 
@@ -47,10 +47,18 @@ The camel-spring-rabbitmq source connector supports 43 options, which are listed
 | *camel.source.endpoint.deadLetterRoutingKey* | The routing key for the dead letter exchange | null | false | MEDIUM
 | *camel.source.endpoint.exchangeType* | The type of the exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM
 | *camel.source.endpoint.exclusive* | Set to true for an exclusive consumer | false | false | MEDIUM
+| *camel.source.endpoint.maximumRetryAttempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM
 | *camel.source.endpoint.noLocal* | Set to true for an no-local consumer | false | false | MEDIUM
 | *camel.source.endpoint.queues* | The queue(s) to use for consuming messages. Multiple queue names can be separated by comma. If none has been configured then Camel will generate an unique id as the queue name for the consumer. | null | false | MEDIUM
+| *camel.source.endpoint.rejectAndDontRequeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM
+| *camel.source.endpoint.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM
+| *camel.source.endpoint.concurrentConsumers* | The number of consumers | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *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.maxConcurrentConsumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM
+| *camel.source.endpoint.messageListenerContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM
+| *camel.source.endpoint.prefetchCount* | Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput. | null | false | MEDIUM
+| *camel.source.endpoint.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM
 | *camel.source.endpoint.args* | Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000 | null | false | MEDIUM
 | *camel.source.endpoint.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM
 | *camel.source.endpoint.messagePropertiesConverter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. | null | false | MEDIUM
@@ -65,9 +73,16 @@ The camel-spring-rabbitmq source connector supports 43 options, which are listed
 | *camel.component.spring-rabbitmq.deadLetterExchange Type* | The type of the dead letter exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM
 | *camel.component.spring-rabbitmq.deadLetterQueue* | The name of the dead letter queue | null | false | MEDIUM
 | *camel.component.spring-rabbitmq.deadLetterRouting Key* | The routing key for the dead letter exchange | null | false | MEDIUM
+| *camel.component.spring-rabbitmq.maximumRetry Attempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM
+| *camel.component.spring-rabbitmq.rejectAndDont Requeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM
+| *camel.component.spring-rabbitmq.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM
+| *camel.component.spring-rabbitmq.concurrent Consumers* | The number of consumers | 1 | false | MEDIUM
 | *camel.component.spring-rabbitmq.errorHandler* | To use a custom ErrorHandler for handling exceptions from the message listener (consumer) | null | false | MEDIUM
 | *camel.component.spring-rabbitmq.listenerContainer Factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages | null | false | MEDIUM
+| *camel.component.spring-rabbitmq.maxConcurrent Consumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM
+| *camel.component.spring-rabbitmq.messageListener ContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM
 | *camel.component.spring-rabbitmq.prefetchCount* | Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput. | 250 | false | MEDIUM
+| *camel.component.spring-rabbitmq.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM
 | *camel.component.spring-rabbitmq.shutdownTimeout* | The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout. | 5000L | false | MEDIUM
 | *camel.component.spring-rabbitmq.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.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java
index 3895783..e25f5be 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java
@@ -71,9 +71,15 @@ public class CamelSpringrabbitmqSinkConnectorConfig
     public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_CONF = "camel.component.spring-rabbitmq.testConnectionOnStartup";
     public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DOC = "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well.";
     public static final Boolean CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DEFAULT = false;
+    public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_CONF = "camel.component.spring-rabbitmq.allowNullBody";
+    public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_DOC = "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown.";
+    public static final Boolean CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_DEFAULT = false;
     public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.spring-rabbitmq.lazyStartProducer";
     public static final String CAMEL_SINK_SPRINGRABBITMQ_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 [...]
     public static final Boolean CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_CONF = "camel.component.spring-rabbitmq.replyTimeout";
+    public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DOC = "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout.";
+    public static final Long CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DEFAULT = 5000L;
     public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.spring-rabbitmq.autowiredEnabled";
     public static final String CAMEL_SINK_SPRINGRABBITMQ_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_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -118,7 +124,9 @@ public class CamelSpringrabbitmqSinkConnectorConfig
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AMQP_ADMIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AMQP_ADMIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AMQP_ADMIN_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DOC);
+        conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_ALLOW_NULL_BODY_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DOC);
         conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_DOC);
diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java
index 65dc5c5..7f30c82 100644
--- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java
+++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java
@@ -74,18 +74,42 @@ public class CamelSpringrabbitmqSourceConnectorConfig
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_CONF = "camel.source.endpoint.exclusive";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DOC = "Set to true for an exclusive consumer";
     public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DEFAULT = false;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_CONF = "camel.source.endpoint.maximumRetryAttempts";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DOC = "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message";
+    public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT = 5;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_CONF = "camel.source.endpoint.noLocal";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DOC = "Set to true for an no-local consumer";
     public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DEFAULT = false;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_CONF = "camel.source.endpoint.queues";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DOC = "The queue(s) to use for consuming messages. Multiple queue names can be separated by comma. If none has been configured then Camel will generate an unique id as the queue name for the consumer.";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_CONF = "camel.source.endpoint.rejectAndDontRequeue";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DOC = "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured.";
+    public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_CONF = "camel.source.endpoint.retryDelay";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DOC = "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process";
+    public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DEFAULT = 1000;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_CONF = "camel.source.endpoint.concurrentConsumers";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DOC = "The number of consumers";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT = null;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_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_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_CONF = "camel.source.endpoint.maxConcurrentConsumers";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DOC = "The maximum number of consumers (available only with SMLC)";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF = "camel.source.endpoint.messageListenerContainerType";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC = "The type of the MessageListenerContainer One of: [DMLC] [SMLC]";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT = "DMLC";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_CONF = "camel.source.endpoint.prefetchCount";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DOC = "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput.";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_CONF = "camel.source.endpoint.retry";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DOC = "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DEFAULT = null;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_CONF = "camel.source.endpoint.args";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DOC = "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DEFAULT = null;
@@ -128,15 +152,36 @@ public class CamelSpringrabbitmqSourceConnectorConfig
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_CONF = "camel.component.spring-rabbitmq.deadLetterRoutingKey";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DOC = "The routing key for the dead letter exchange";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_CONF = "camel.component.spring-rabbitmq.maximumRetryAttempts";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DOC = "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message";
+    public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT = 5;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_CONF = "camel.component.spring-rabbitmq.rejectAndDontRequeue";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DOC = "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured.";
+    public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DEFAULT = true;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_CONF = "camel.component.spring-rabbitmq.retryDelay";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DOC = "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process";
+    public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DEFAULT = 1000;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_CONF = "camel.component.spring-rabbitmq.concurrentConsumers";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DOC = "The number of consumers";
+    public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT = 1;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_CONF = "camel.component.spring-rabbitmq.errorHandler";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DOC = "To use a custom ErrorHandler for handling exceptions from the message listener (consumer)";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DEFAULT = null;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_CONF = "camel.component.spring-rabbitmq.listenerContainerFactory";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DOC = "To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_CONF = "camel.component.spring-rabbitmq.maxConcurrentConsumers";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DOC = "The maximum number of consumers (available only with SMLC)";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF = "camel.component.spring-rabbitmq.messageListenerContainerType";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC = "The type of the MessageListenerContainer One of: [DMLC] [SMLC]";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT = "DMLC";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_CONF = "camel.component.spring-rabbitmq.prefetchCount";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DOC = "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput.";
     public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DEFAULT = 250;
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_CONF = "camel.component.spring-rabbitmq.retry";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DOC = "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.";
+    public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DEFAULT = null;
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_CONF = "camel.component.spring-rabbitmq.shutdownTimeout";
     public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DOC = "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout.";
     public static final Long CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DEFAULT = 5000L;
@@ -185,10 +230,18 @@ public class CamelSpringrabbitmqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_DOC);
@@ -203,9 +256,16 @@ public class CamelSpringrabbitmqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DOC);
+        conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DOC);
diff --git a/connectors/camel-vertx-http-kafka-connector/src/generated/resources/camel-vertx-http-sink.json b/connectors/camel-vertx-http-kafka-connector/src/generated/resources/camel-vertx-http-sink.json
index 82b8287..b89d20e 100644
--- a/connectors/camel-vertx-http-kafka-connector/src/generated/resources/camel-vertx-http-sink.json
+++ b/connectors/camel-vertx-http-kafka-connector/src/generated/resources/camel-vertx-http-sink.json
@@ -68,6 +68,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.responsePayloadAsByteArray": {
+			"name": "camel.sink.endpoint.responsePayloadAsByteArray",
+			"description": "Whether the response body should be byte or as io.vertx.core.buffer.Buffer",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.sessionManagement": {
 			"name": "camel.sink.endpoint.sessionManagement",
 			"description": "Enables session management via WebClientSession. By default the client is configured to use an in-memory CookieStore. The cookieStore option can be used to override this",
@@ -181,6 +188,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-http.responsePayloadAsByteArray": {
+			"name": "camel.component.vertx-http.responsePayloadAsByteArray",
+			"description": "Whether the response body should be byte or as io.vertx.core.buffer.Buffer",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-http.allowJavaSerializedObject": {
 			"name": "camel.component.vertx-http.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request has the Content-Type application\/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk.",
diff --git a/connectors/camel-vertx-http-kafka-connector/src/main/docs/camel-vertx-http-kafka-sink-connector.adoc b/connectors/camel-vertx-http-kafka-connector/src/main/docs/camel-vertx-http-kafka-sink-connector.adoc
index a5f3266..84077cd 100644
--- a/connectors/camel-vertx-http-kafka-connector/src/main/docs/camel-vertx-http-kafka-sink-connector.adoc
+++ b/connectors/camel-vertx-http-kafka-connector/src/main/docs/camel-vertx-http-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxhttp.CamelVertxhttpSinkConn
 ----
 
 
-The camel-vertx-http sink connector supports 40 options, which are listed below.
+The camel-vertx-http sink connector supports 42 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The camel-vertx-http sink connector supports 40 options, which are listed below.
 | *camel.sink.endpoint.httpMethod* | The HTTP method to use. The HttpMethod header cannot override this option if set One of: [OPTIONS] [GET] [HEAD] [POST] [PUT] [DELETE] [TRACE] [CONNECT] [PATCH] [OTHER] | 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.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.responsePayloadAsByteArray* | Whether the response body should be byte or as io.vertx.core.buffer.Buffer | true | false | MEDIUM
 | *camel.sink.endpoint.sessionManagement* | Enables session management via WebClientSession. By default the client is configured to use an in-memory CookieStore. The cookieStore option can be used to override this | false | false | MEDIUM
 | *camel.sink.endpoint.throwExceptionOnFailure* | Disable throwing HttpOperationFailedException in case of failed responses from the remote server | true | false | MEDIUM
 | *camel.sink.endpoint.timeout* | The amount of time in milliseconds after which if the request does not return any data within the timeout period a TimeoutException fails the request. Setting zero or a negative value disables the timeout. | -1L | false | MEDIUM
@@ -55,6 +56,7 @@ The camel-vertx-http sink connector supports 40 options, which are listed below.
 | *camel.sink.endpoint.bearerToken* | The bearer token to use for bearer token authentication | null | false | MEDIUM
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters | null | false | MEDIUM
 | *camel.component.vertx-http.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.vertx-http.responsePayloadAsByte Array* | Whether the response body should be byte or as io.vertx.core.buffer.Buffer | true | false | MEDIUM
 | *camel.component.vertx-http.allowJavaSerialized Object* | Whether to allow java serialization when a request has the Content-Type application/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk. | false | false | MEDIUM
 | *camel.component.vertx-http.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.vertx-http.vertx* | To use an existing vertx instead of creating a new instance | null | false | MEDIUM
diff --git a/connectors/camel-vertx-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxhttp/CamelVertxhttpSinkConnectorConfig.java b/connectors/camel-vertx-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxhttp/CamelVertxhttpSinkConnectorConfig.java
index 2ac371d..3b0642b 100644
--- a/connectors/camel-vertx-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxhttp/CamelVertxhttpSinkConnectorConfig.java
+++ b/connectors/camel-vertx-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxhttp/CamelVertxhttpSinkConnectorConfig.java
@@ -47,6 +47,9 @@ public class CamelVertxhttpSinkConnectorConfig
     public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included";
     public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_CONF = "camel.sink.endpoint.responsePayloadAsByteArray";
+    public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DOC = "Whether the response body should be byte or as io.vertx.core.buffer.Buffer";
+    public static final Boolean CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DEFAULT = true;
     public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_CONF = "camel.sink.endpoint.sessionManagement";
     public static final String CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_DOC = "Enables session management via WebClientSession. By default the client is configured to use an in-memory CookieStore. The cookieStore option can be used to override this";
     public static final Boolean CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_DEFAULT = false;
@@ -98,6 +101,9 @@ public class CamelVertxhttpSinkConnectorConfig
     public static final String CAMEL_SINK_VERTXHTTP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.vertx-http.lazyStartProducer";
     public static final String CAMEL_SINK_VERTXHTTP_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_VERTXHTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_CONF = "camel.component.vertx-http.responsePayloadAsByteArray";
+    public static final String CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DOC = "Whether the response body should be byte or as io.vertx.core.buffer.Buffer";
+    public static final Boolean CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DEFAULT = true;
     public static final String CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.vertx-http.allowJavaSerializedObject";
     public static final String CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request has the Content-Type application/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk.";
     public static final Boolean CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
@@ -166,6 +172,7 @@ public class CamelVertxhttpSinkConnectorConfig
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_HTTP_METHOD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXHTTP_ENDPOINT_HTTP_METHOD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_HTTP_METHOD_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_SESSION_MANAGEMENT_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_VERTXHTTP_ENDPOINT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_TIMEOUT_DOC);
@@ -183,6 +190,7 @@ public class CamelVertxhttpSinkConnectorConfig
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_BEARER_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXHTTP_ENDPOINT_BEARER_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_BEARER_TOKEN_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXHTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_COMPONENT_RESPONSE_PAYLOAD_AS_BYTE_ARRAY_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXHTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_VERTXHTTP_COMPONENT_VERTX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXHTTP_COMPONENT_VERTX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXHTTP_COMPONENT_VERTX_DOC);
diff --git a/connectors/camel-vertx-kafka-kafka-connector/src/generated/resources/camel-vertx-kafka-source.json b/connectors/camel-vertx-kafka-kafka-connector/src/generated/resources/camel-vertx-kafka-source.json
index bc3d44b..70dba68 100644
--- a/connectors/camel-vertx-kafka-kafka-connector/src/generated/resources/camel-vertx-kafka-source.json
+++ b/connectors/camel-vertx-kafka-kafka-connector/src/generated/resources/camel-vertx-kafka-source.json
@@ -172,6 +172,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.allowManualCommit": {
+			"name": "camel.source.endpoint.allowManualCommit",
+			"description": "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to disable the Kafka Consumer default  [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.autoCommitIntervalMs": {
 			"name": "camel.source.endpoint.autoCommitIntervalMs",
 			"description": "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.",
@@ -755,6 +762,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-kafka.allowManualCommit": {
+			"name": "camel.component.vertx-kafka.allowManualCommit",
+			"description": "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to disable the Kafka Consumer default  [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-kafka.autoCommitIntervalMs": {
 			"name": "camel.component.vertx-kafka.autoCommitIntervalMs",
 			"description": "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.",
@@ -931,6 +945,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.vertx-kafka.kafkaManualCommitFactory": {
+			"name": "camel.component.vertx-kafka.kafkaManualCommitFactory",
+			"description": "Factory to use for creating org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances. This allows to plugin a custom factory to create custom org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.vertx-kafka.autowiredEnabled": {
 			"name": "camel.component.vertx-kafka.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-vertx-kafka-kafka-connector/src/main/docs/camel-vertx-kafka-kafka-source-connector.adoc b/connectors/camel-vertx-kafka-kafka-connector/src/main/docs/camel-vertx-kafka-kafka-source-connector.adoc
index b12a000..cba0535 100644
--- a/connectors/camel-vertx-kafka-kafka-connector/src/main/docs/camel-vertx-kafka-kafka-source-connector.adoc
+++ b/connectors/camel-vertx-kafka-kafka-connector/src/main/docs/camel-vertx-kafka-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxkafka.CamelVertxkafkaSource
 ----
 
 
-The camel-vertx-kafka source connector supports 170 options, which are listed below.
+The camel-vertx-kafka source connector supports 173 options, which are listed below.
 
 
 
@@ -54,6 +54,7 @@ The camel-vertx-kafka source connector supports 170 options, which are listed be
 | *camel.source.endpoint.socketConnectionSetupTimeout MaxMs* | The maximum amount of time the client will wait for the socket connection to be established. The connection setup timeout will increase exponentially for each consecutive connection failure up to this maximum. To avoid connection storms, a randomization factor of 0.2 will be applied to the timeout resulting in a random range between 20% below and 20% above the computed value. | 127000L | false | MEDIUM
 | *camel.source.endpoint.socketConnectionSetupTimeout Ms* | The amount of time the client will wait for the socket connection to be established. If the connection is not built before the timeout elapses, clients will close the socket channel. | 10000L | false | MEDIUM
 | *camel.source.endpoint.allowAutoCreateTopics* | Allow automatic topic creation on the broker when subscribing to or assigning a topic. A topic being subscribed to will be automatically created only if the broker allows for it using auto.create.topics.enable broker configuration. This configuration must be set to false when using brokers older than 0.11.0 | true | false | MEDIUM
+| *camel.source.endpoint.allowManualCommit* | Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to disable  [...]
 | *camel.source.endpoint.autoCommitIntervalMs* | The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true. | 5000 | false | MEDIUM
 | *camel.source.endpoint.autoOffsetReset* | What to do when there is no initial offset in Kafka or if the current offset does not exist any more on the server (e.g. because that data has been deleted): earliest: automatically reset the offset to the earliest offsetlatest: automatically reset the offset to the latest offsetnone: throw exception to the consumer if no previous offset is found for the consumer's groupanything else: throw exception to the consumer. One of: [latest] [earliest] [...]
 | *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
@@ -138,6 +139,7 @@ The camel-vertx-kafka source connector supports 170 options, which are listed be
 | *camel.component.vertx-kafka.socketConnectionSetup TimeoutMaxMs* | The maximum amount of time the client will wait for the socket connection to be established. The connection setup timeout will increase exponentially for each consecutive connection failure up to this maximum. To avoid connection storms, a randomization factor of 0.2 will be applied to the timeout resulting in a random range between 20% below and 20% above the computed value. | 127000L | false | MEDIUM
 | *camel.component.vertx-kafka.socketConnectionSetup TimeoutMs* | The amount of time the client will wait for the socket connection to be established. If the connection is not built before the timeout elapses, clients will close the socket channel. | 10000L | false | MEDIUM
 | *camel.component.vertx-kafka.allowAutoCreateTopics* | Allow automatic topic creation on the broker when subscribing to or assigning a topic. A topic being subscribed to will be automatically created only if the broker allows for it using auto.create.topics.enable broker configuration. This configuration must be set to false when using brokers older than 0.11.0 | true | false | MEDIUM
+| *camel.component.vertx-kafka.allowManualCommit* | Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of the offset committing, you may need to di [...]
 | *camel.component.vertx-kafka.autoCommitIntervalMs* | The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true. | 5000 | false | MEDIUM
 | *camel.component.vertx-kafka.autoOffsetReset* | What to do when there is no initial offset in Kafka or if the current offset does not exist any more on the server (e.g. because that data has been deleted): earliest: automatically reset the offset to the earliest offsetlatest: automatically reset the offset to the latest offsetnone: throw exception to the consumer if no previous offset is found for the consumer's groupanything else: throw exception to the consumer. One of: [latest] [ear [...]
 | *camel.component.vertx-kafka.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
@@ -162,6 +164,7 @@ The camel-vertx-kafka source connector supports 170 options, which are listed be
 | *camel.component.vertx-kafka.seekToPosition* | Set if KafkaConsumer will read from beginning or end on startup: beginning : read from beginning end : read from end. One of: [beginning] [end] | null | false | MEDIUM
 | *camel.component.vertx-kafka.sessionTimeoutMs* | The timeout used to detect client failures when using Kafka's group management facility. The client sends periodic heartbeats to indicate its liveness to the broker. If no heartbeats are received by the broker before the expiration of this session timeout, then the broker will remove this client from the group and initiate a rebalance. Note that the value must be in the allowable range as configured in the broker configuration by group.m [...]
 | *camel.component.vertx-kafka.valueDeserializer* | Deserializer class for value that implements the org.apache.kafka.common.serialization.Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
+| *camel.component.vertx-kafka.kafkaManualCommit Factory* | Factory to use for creating org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances. This allows to plugin a custom factory to create custom org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box. | null | false | MEDIUM
 | *camel.component.vertx-kafka.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.vertx-kafka.vertx* | To use an existing vertx instead of creating a new instance | null | false | MEDIUM
 | *camel.component.vertx-kafka.vertxKafkaClient Factory* | Factory to use for creating io.vertx.kafka.client.consumer.KafkaConsumer and io.vertx.kafka.client.consumer.KafkaProducer instances. This allows to configure a custom factory to create custom KafkaConsumer and KafkaProducer instances with logic that extends the vanilla VertX Kafka clients. | null | false | MEDIUM
diff --git a/connectors/camel-vertx-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxkafka/CamelVertxkafkaSourceConnectorConfig.java b/connectors/camel-vertx-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxkafka/CamelVertxkafkaSourceConnectorConfig.java
index c91d7c6..47eca9c 100644
--- a/connectors/camel-vertx-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxkafka/CamelVertxkafkaSourceConnectorConfig.java
+++ b/connectors/camel-vertx-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxkafka/CamelVertxkafkaSourceConnectorConfig.java
@@ -95,6 +95,9 @@ public class CamelVertxkafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_CONF = "camel.source.endpoint.allowAutoCreateTopics";
     public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_DOC = "Allow automatic topic creation on the broker when subscribing to or assigning a topic. A topic being subscribed to will be automatically created only if the broker allows for it using auto.create.topics.enable broker configuration. This configuration must be set to false when using brokers older than 0.11.0";
     public static final Boolean CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_CONF = "camel.source.endpoint.allowManualCommit";
+    public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_DOC = "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of th [...]
+    public static final Boolean CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_DEFAULT = false;
     public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_CONF = "camel.source.endpoint.autoCommitIntervalMs";
     public static final String CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_DOC = "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.";
     public static final Integer CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_DEFAULT = 5000;
@@ -347,6 +350,9 @@ public class CamelVertxkafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_CONF = "camel.component.vertx-kafka.allowAutoCreateTopics";
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_DOC = "Allow automatic topic creation on the broker when subscribing to or assigning a topic. A topic being subscribed to will be automatically created only if the broker allows for it using auto.create.topics.enable broker configuration. This configuration must be set to false when using brokers older than 0.11.0";
     public static final Boolean CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_CONF = "camel.component.vertx-kafka.allowManualCommit";
+    public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_DOC = "Whether to allow doing manual commits via org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this option is enabled then an instance of org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. Note: To take full control of t [...]
+    public static final Boolean CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_DEFAULT = false;
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_CONF = "camel.component.vertx-kafka.autoCommitIntervalMs";
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_DOC = "The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if enable.auto.commit is set to true.";
     public static final Integer CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_DEFAULT = 5000;
@@ -419,6 +425,9 @@ public class CamelVertxkafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_CONF = "camel.component.vertx-kafka.valueDeserializer";
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_DOC = "Deserializer class for value that implements the org.apache.kafka.common.serialization.Deserializer interface.";
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringDeserializer";
+    public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_CONF = "camel.component.vertx-kafka.kafkaManualCommitFactory";
+    public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DOC = "Factory to use for creating org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances. This allows to plugin a custom factory to create custom org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box.";
+    public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DEFAULT = null;
     public static final String CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.vertx-kafka.autowiredEnabled";
     public static final String CAMEL_SOURCE_VERTXKAFKA_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_VERTXKAFKA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -572,6 +581,7 @@ public class CamelVertxkafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_AUTO_CREATE_TOPICS_DOC);
+        conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_ALLOW_MANUAL_COMMIT_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_COMMIT_INTERVAL_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_OFFSET_RESET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_OFFSET_RESET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_AUTO_OFFSET_RESET_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -656,6 +666,7 @@ public class CamelVertxkafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SOCKET_CONNECTION_SETUP_TIMEOUT_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_AUTO_CREATE_TOPICS_DOC);
+        conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_ALLOW_MANUAL_COMMIT_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_COMMIT_INTERVAL_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_OFFSET_RESET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_OFFSET_RESET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTO_OFFSET_RESET_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
@@ -680,6 +691,7 @@ public class CamelVertxkafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SEEK_TO_POSITION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SEEK_TO_POSITION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SEEK_TO_POSITION_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SESSION_TIMEOUT_MS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SESSION_TIMEOUT_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_SESSION_TIMEOUT_MS_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VALUE_DESERIALIZER_DOC);
+        conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_KAFKA_MANUAL_COMMIT_FACTORY_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_DOC);
         conf.define(CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_KAFKA_CLIENT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_KAFKA_CLIENT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_VERTXKAFKA_COMPONENT_VERTX_KAFKA_CLIENT_FACTORY_DOC);
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 52c980c..7369e04 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -213,6 +213,7 @@
         <module>camel-atomix-set-kafka-connector</module>
         <module>camel-atomix-value-kafka-connector</module>
         <module>camel-avro-kafka-connector</module>
+        <module>camel-aws-secrets-manager-kafka-connector</module>
         <module>camel-aws2-athena-kafka-connector</module>
         <module>camel-aws2-cw-kafka-connector</module>
         <module>camel-aws2-ddb-kafka-connector</module>
@@ -303,11 +304,13 @@
         <module>camel-google-calendar-kafka-connector</module>
         <module>camel-google-calendar-stream-kafka-connector</module>
         <module>camel-google-drive-kafka-connector</module>
+        <module>camel-google-functions-kafka-connector</module>
         <module>camel-google-mail-kafka-connector</module>
         <module>camel-google-mail-stream-kafka-connector</module>
         <module>camel-google-pubsub-kafka-connector</module>
         <module>camel-google-sheets-kafka-connector</module>
         <module>camel-google-sheets-stream-kafka-connector</module>
+        <module>camel-google-storage-kafka-connector</module>
         <module>camel-gora-kafka-connector</module>
         <module>camel-grape-kafka-connector</module>
         <module>camel-graphql-kafka-connector</module>
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index f96c859..a1a2468 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -70,50 +70,8 @@
 ** camel-avro-kafka-connector
 *** xref:connectors/camel-avro-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-avro-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-cw-kafka-connector
-*** xref:connectors/camel-aws-cw-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-ddb-kafka-connector
-*** xref:connectors/camel-aws-ddb-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-ddbstream-kafka-connector
-*** xref:connectors/camel-aws-ddbstream-kafka-source-connector.adoc[Source Docs]
-** camel-aws-ec2-kafka-connector
-*** xref:connectors/camel-aws-ec2-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-ecs-kafka-connector
-*** xref:connectors/camel-aws-ecs-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-eks-kafka-connector
-*** xref:connectors/camel-aws-eks-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-iam-kafka-connector
-*** xref:connectors/camel-aws-iam-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-kinesis-firehose-kafka-connector
-*** xref:connectors/camel-aws-kinesis-firehose-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-kinesis-kafka-connector
-*** xref:connectors/camel-aws-kinesis-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-aws-kinesis-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-kms-kafka-connector
-*** xref:connectors/camel-aws-kms-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-lambda-kafka-connector
-*** xref:connectors/camel-aws-lambda-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-mq-kafka-connector
-*** xref:connectors/camel-aws-mq-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-msk-kafka-connector
-*** xref:connectors/camel-aws-msk-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-s3-kafka-connector
-*** xref:connectors/camel-aws-s3-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-aws-s3-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-sdb-kafka-connector
-*** xref:connectors/camel-aws-sdb-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-ses-kafka-connector
-*** xref:connectors/camel-aws-ses-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-sns-kafka-connector
-*** xref:connectors/camel-aws-sns-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-sqs-kafka-connector
-*** xref:connectors/camel-aws-sqs-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-aws-sqs-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-swf-kafka-connector
-*** xref:connectors/camel-aws-swf-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-aws-swf-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-translate-kafka-connector
-*** xref:connectors/camel-aws-translate-kafka-sink-connector.adoc[Sink Docs]
+** camel-aws-secrets-manager-kafka-connector
+*** xref:connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc[Sink Docs]
 ** camel-aws2-athena-kafka-connector
 *** xref:connectors/camel-aws2-athena-kafka-sink-connector.adoc[Sink Docs]
 ** camel-aws2-cw-kafka-connector
@@ -159,15 +117,9 @@
 *** xref:connectors/camel-aws2-sts-kafka-sink-connector.adoc[Sink Docs]
 ** camel-aws2-translate-kafka-connector
 *** xref:connectors/camel-aws2-translate-kafka-sink-connector.adoc[Sink Docs]
-** camel-azure-blob-kafka-connector
-*** xref:connectors/camel-azure-blob-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-azure-blob-kafka-sink-connector.adoc[Sink Docs]
 ** camel-azure-eventhubs-kafka-connector
 *** xref:connectors/camel-azure-eventhubs-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-azure-eventhubs-kafka-sink-connector.adoc[Sink Docs]
-** camel-azure-queue-kafka-connector
-*** xref:connectors/camel-azure-queue-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-azure-queue-kafka-sink-connector.adoc[Sink Docs]
 ** camel-azure-storage-blob-kafka-connector
 *** xref:connectors/camel-azure-storage-blob-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-azure-storage-blob-kafka-sink-connector.adoc[Sink Docs]
@@ -344,6 +296,8 @@
 ** camel-google-drive-kafka-connector
 *** xref:connectors/camel-google-drive-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-google-drive-kafka-sink-connector.adoc[Sink Docs]
+** camel-google-functions-kafka-connector
+*** xref:connectors/camel-google-functions-kafka-sink-connector.adoc[Sink Docs]
 ** camel-google-mail-kafka-connector
 *** xref:connectors/camel-google-mail-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-google-mail-kafka-sink-connector.adoc[Sink Docs]
@@ -357,6 +311,9 @@
 *** xref:connectors/camel-google-sheets-kafka-sink-connector.adoc[Sink Docs]
 ** camel-google-sheets-stream-kafka-connector
 *** xref:connectors/camel-google-sheets-stream-kafka-source-connector.adoc[Source Docs]
+** camel-google-storage-kafka-connector
+*** xref:connectors/camel-google-storage-kafka-source-connector.adoc[Source Docs]
+*** xref:connectors/camel-google-storage-kafka-sink-connector.adoc[Sink Docs]
 ** camel-gora-kafka-connector
 *** xref:connectors/camel-gora-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-gora-kafka-sink-connector.adoc[Sink Docs]
diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc
index 4b1e9dd..59c89b1 100644
--- a/docs/modules/ROOT/pages/connectors.adoc
+++ b/docs/modules/ROOT/pages/connectors.adoc
@@ -2,7 +2,7 @@
 = Supported connectors and documentation
 
 // kafka-connectors list: START
-Number of Camel Kafka connectors: 356 
+Number of Camel Kafka connectors: 337 
 
 [width="100%",cols="4,1,1,1,1,1",options="header"]
 |===
@@ -27,26 +27,7 @@ Number of Camel Kafka connectors: 356
 | *camel-atomix-set-kafka-connector* | true | true | xref:connectors/camel-atomix-set-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atomix-set-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atomix-set-kafka-connector/0.8.0/camel-atomix-set-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-atomix-value-kafka-connector* | true | true | xref:connectors/camel-atomix-value-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atomix-value-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atomix-value-kafka-connector/0.8.0/camel-atomix-value-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-avro-kafka-connector* | true | true | xref:connectors/camel-avro-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-avro-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-avro-kafka-connector/0.8.0/camel-avro-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-cw-kafka-connector* | true | false | xref:connectors/camel-aws-cw-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-cw-kafka-connector/0.8.0/camel-aws-cw-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-ddb-kafka-connector* | true | false | xref:connectors/camel-aws-ddb-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-ddb-kafka-connector/0.8.0/camel-aws-ddb-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-ddbstream-kafka-connector* | false | true |  | xref:connectors/camel-aws-ddbstream-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-ddbstream-kafka-connector/0.8.0/camel-aws-ddbstream-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-ec2-kafka-connector* | true | false | xref:connectors/camel-aws-ec2-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-ec2-kafka-connector/0.8.0/camel-aws-ec2-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-ecs-kafka-connector* | true | false | xref:connectors/camel-aws-ecs-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-ecs-kafka-connector/0.8.0/camel-aws-ecs-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-eks-kafka-connector* | true | false | xref:connectors/camel-aws-eks-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-eks-kafka-connector/0.8.0/camel-aws-eks-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-iam-kafka-connector* | true | false | xref:connectors/camel-aws-iam-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-iam-kafka-connector/0.8.0/camel-aws-iam-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-kinesis-firehose-kafka-connector* | true | false | xref:connectors/camel-aws-kinesis-firehose-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-kinesis-firehose-kafka-connector/0.8.0/camel-aws-kinesis-firehose-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-kinesis-kafka-connector* | true | true | xref:connectors/camel-aws-kinesis-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-kinesis-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-kinesis-kafka-connector/0.8.0/camel-aws-kinesis-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-kms-kafka-connector* | true | false | xref:connectors/camel-aws-kms-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-kms-kafka-connector/0.8.0/camel-aws-kms-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-lambda-kafka-connector* | true | false | xref:connectors/camel-aws-lambda-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-lambda-kafka-connector/0.8.0/camel-aws-lambda-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-mq-kafka-connector* | true | false | xref:connectors/camel-aws-mq-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-mq-kafka-connector/0.8.0/camel-aws-mq-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-msk-kafka-connector* | true | false | xref:connectors/camel-aws-msk-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-msk-kafka-connector/0.8.0/camel-aws-msk-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-s3-kafka-connector* | true | true | xref:connectors/camel-aws-s3-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-s3-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-s3-kafka-connector/0.8.0/camel-aws-s3-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-sdb-kafka-connector* | true | false | xref:connectors/camel-aws-sdb-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-sdb-kafka-connector/0.8.0/camel-aws-sdb-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-ses-kafka-connector* | true | false | xref:connectors/camel-aws-ses-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-ses-kafka-connector/0.8.0/camel-aws-ses-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-sns-kafka-connector* | true | false | xref:connectors/camel-aws-sns-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-sns-kafka-connector/0.8.0/camel-aws-sns-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-sqs-kafka-connector* | true | true | xref:connectors/camel-aws-sqs-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-sqs-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-sqs-kafka-connector/0.8.0/camel-aws-sqs-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-swf-kafka-connector* | true | true | xref:connectors/camel-aws-swf-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-swf-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-swf-kafka-connector/0.8.0/camel-aws-swf-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-aws-translate-kafka-connector* | true | false | xref:connectors/camel-aws-translate-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-translate-kafka-connector/0.8.0/camel-aws-translate-kafka-connector-0.8.0-package.tar.gz[Download]
+| *camel-aws-secrets-manager-kafka-connector* | true | false | xref:connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-secrets-manager-kafka-connector/0.8.0/camel-aws-secrets-manager-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-aws2-athena-kafka-connector* | true | false | xref:connectors/camel-aws2-athena-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-athena-kafka-connector/0.8.0/camel-aws2-athena-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-aws2-cw-kafka-connector* | true | false | xref:connectors/camel-aws2-cw-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-cw-kafka-connector/0.8.0/camel-aws2-cw-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-aws2-ddb-kafka-connector* | true | false | xref:connectors/camel-aws2-ddb-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-ddb-kafka-connector/0.8.0/camel-aws2-ddb-kafka-connector-0.8.0-package.tar.gz[Download]
@@ -68,9 +49,7 @@ Number of Camel Kafka connectors: 356
 | *camel-aws2-sqs-kafka-connector* | true | true | xref:connectors/camel-aws2-sqs-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws2-sqs-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-sqs-kafka-connector/0.8.0/camel-aws2-sqs-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-aws2-sts-kafka-connector* | true | false | xref:connectors/camel-aws2-sts-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-sts-kafka-connector/0.8.0/camel-aws2-sts-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-aws2-translate-kafka-connector* | true | false | xref:connectors/camel-aws2-translate-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-translate-kafka-connector/0.8.0/camel-aws2-translate-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-azure-blob-kafka-connector* | true | true | xref:connectors/camel-azure-blob-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-blob-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-blob-kafka-connector/0.8.0/camel-azure-blob-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-azure-eventhubs-kafka-connector* | true | true | xref:connectors/camel-azure-eventhubs-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-eventhubs-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-eventhubs-kafka-connector/0.8.0/camel-azure-eventhubs-kafka-connector-0.8.0-package.tar.gz[Download]
-| *camel-azure-queue-kafka-connector* | true | true | xref:connectors/camel-azure-queue-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-queue-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-queue-kafka-connector/0.8.0/camel-azure-queue-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-azure-storage-blob-kafka-connector* | true | true | xref:connectors/camel-azure-storage-blob-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-storage-blob-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-storage-blob-kafka-connector/0.8.0/camel-azure-storage-blob-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-azure-storage-datalake-kafka-connector* | true | true | xref:connectors/camel-azure-storage-datalake-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-storage-datalake-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-storage-datalake-kafka-connector/0.8.0/camel-azure-storage-datalake-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-azure-storage-queue-kafka-connector* | true | true | xref:connectors/camel-azure-storage-queue-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-azure-storage-queue-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-azure-storage-queue-kafka-connector/0.8.0/camel-azure-storage-queue-kafka-connector-0.8.0-package.tar.gz[Download]
@@ -139,11 +118,13 @@ Number of Camel Kafka connectors: 356
 | *camel-google-calendar-kafka-connector* | true | true | xref:connectors/camel-google-calendar-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-calendar-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-calendar-kafka-connector/0.8.0/camel-google-calendar-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-calendar-stream-kafka-connector* | false | true |  | xref:connectors/camel-google-calendar-stream-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-calendar-stream-kafka-connector/0.8.0/camel-google-calendar-stream-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-drive-kafka-connector* | true | true | xref:connectors/camel-google-drive-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-drive-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-drive-kafka-connector/0.8.0/camel-google-drive-kafka-connector-0.8.0-package.tar.gz[Download]
+| *camel-google-functions-kafka-connector* | true | false | xref:connectors/camel-google-functions-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-functions-kafka-connector/0.8.0/camel-google-functions-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-mail-kafka-connector* | true | true | xref:connectors/camel-google-mail-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-mail-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-mail-kafka-connector/0.8.0/camel-google-mail-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-mail-stream-kafka-connector* | false | true |  | xref:connectors/camel-google-mail-stream-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-mail-stream-kafka-connector/0.8.0/camel-google-mail-stream-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-pubsub-kafka-connector* | true | true | xref:connectors/camel-google-pubsub-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-pubsub-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-pubsub-kafka-connector/0.8.0/camel-google-pubsub-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-sheets-kafka-connector* | true | true | xref:connectors/camel-google-sheets-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-sheets-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-sheets-kafka-connector/0.8.0/camel-google-sheets-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-google-sheets-stream-kafka-connector* | false | true |  | xref:connectors/camel-google-sheets-stream-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-sheets-stream-kafka-connector/0.8.0/camel-google-sheets-stream-kafka-connector-0.8.0-package.tar.gz[Download]
+| *camel-google-storage-kafka-connector* | true | true | xref:connectors/camel-google-storage-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-google-storage-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-google-storage-kafka-connector/0.8.0/camel-google-storage-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-gora-kafka-connector* | true | true | xref:connectors/camel-gora-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-gora-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-gora-kafka-connector/0.8.0/camel-gora-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-grape-kafka-connector* | true | false | xref:connectors/camel-grape-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-grape-kafka-connector/0.8.0/camel-grape-kafka-connector-0.8.0-package.tar.gz[Download]
 | *camel-graphql-kafka-connector* | true | false | xref:connectors/camel-graphql-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-graphql-kafka-connector/0.8.0/camel-graphql-kafka-connector-0.8.0-package.tar.gz[Download]
diff --git a/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-sink-connector.adoc
index 206aa49..f6dd6c8 100644
--- a/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket sink connector supports 19 options, which are listed below.
+The camel-atmosphere-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -41,9 +41,6 @@ The camel-atmosphere-websocket sink connector supports 19 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.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.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.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
diff --git a/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-source-connector.adoc
index f9f173d..247aaca 100644
--- a/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-atmosphere-websocket-kafka-source-connector.adoc
@@ -51,11 +51,11 @@ The camel-atmosphere-websocket source connector supports 35 options, which are l
 | *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.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.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
+| *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.component.atmosphere-websocket.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.atmosphere-websocket.servletName* | Default name of servlet to use. The default name is CamelServlet. | "CamelServlet" | false | MEDIUM
 | *camel.component.atmosphere-websocket.attachment MultipartBinding* | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
index 63140b0..d99283c 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 29 options, which are listed below.
+The camel-aws2-cw sink connector supports 33 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | 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.name* | The metric name | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -42,6 +43,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | 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.unit* | The metric unit | null | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | 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,6 +51,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *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
+| *camel.component.aws2-cw.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-cw.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -56,6 +59,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
 | *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
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
index d29ab1e..e618515 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 33 options, which are listed below.
+The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 
 
 
@@ -38,12 +38,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | 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.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | The region in which DynamoDB 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.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -54,12 +56,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-ddb.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
 | *camel.component.aws2-ddb.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ddb.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.component.aws2-ddb.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddb.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyPort* | The region in which DynamoDB client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | 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.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
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
index 0f29b14..0f57a52 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 45 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *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
 | *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,6 +44,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.sequenceNumberProvider* | 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.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.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
@@ -67,12 +69,14 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.component.aws2-ddbstream.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.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
 | *camel.component.aws2-ddbstream.maxResultsPer Request* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.component.aws2-ddbstream.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ddbstream.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddbstream.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
index b9790a3..3097f40 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ec2.CamelAws2ec2SinkConnecto
 ----
 
 
-The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws2-ec2 sink connector supports 29 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | 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.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | null [...]
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which EC2 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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | null | false | MEDIUM
 | *camel.component.aws2-ec2.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ec2.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | [...]
+| *camel.component.aws2-ec2.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ec2.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ec2.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.component.aws2-ec2.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -55,6 +58,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ec2.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
index 092f7f7..ba4361a 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ecs.CamelAws2ecsSinkConnecto
 ----
 
 
-The camel-aws2-ecs sink connector supports 25 options, which are listed below.
+The camel-aws2-ecs sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.ecsClient* | To use a existing configured AWS ECS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-ecs.ecsClient* | To use a existing configured AWS ECS as client | null | false | MEDIUM
 | *camel.component.aws2-ecs.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-ecs.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-ecs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ecs.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ecs.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ecs.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.aws2-ecs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ecs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
index d20c169..e83fbaa 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eks.CamelAws2eksSinkConnecto
 ----
 
 
-The camel-aws2-eks sink connector supports 25 options, which are listed below.
+The camel-aws2-eks sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.eksClient* | To use a existing configured AWS EKS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eks.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-eks.eksClient* | To use a existing configured AWS EKS as client | null | false | MEDIUM
 | *camel.component.aws2-eks.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-eks.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-eks.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eks.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eks.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eks.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-eks.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eks.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
index bf448fd..95f58f0 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 27 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
@@ -36,12 +36,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | 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.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Eventbridge client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | false | MEDIUM
@@ -49,12 +51,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.component.aws2-eventbridge.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eventbridge.region* | The region in which Eventbridge client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eventbridge.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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-eventbridge.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
index d78702a..aa83541 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnecto
 ----
 
 
-The camel-aws2-iam sink connector supports 25 options, which are listed below.
+The camel-aws2-iam sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.iamClient* | To use a existing configured AWS IAM as client | 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.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | "aws-global" | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-iam.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-iam.iamClient* | To use a existing configured AWS IAM as client | null | false | MEDIUM
 | *camel.component.aws2-iam.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-iam.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.component.aws2-iam.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-iam.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-iam.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-iam.region* | The region in which IAM 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() | "aws-global" | false | MEDIUM
 | *camel.component.aws2-iam.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-iam.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
index 1460f0b..7ecc13d 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2kms.CamelAws2kmsSinkConnecto
 ----
 
 
-The camel-aws2-kms sink connector supports 25 options, which are listed below.
+The camel-aws2-kms sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.kmsClient* | To use a existing configured AWS KMS as client | 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.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *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 EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-kms.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-kms.kmsClient* | To use a existing configured AWS KMS as client | null | false | MEDIUM
 | *camel.component.aws2-kms.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-kms.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.component.aws2-kms.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-kms.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-kms.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-kms.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-kms.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-kms.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
index a6bdc39..703ff97 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2lambda.CamelAws2lambdaSinkCo
 ----
 
 
-The camel-aws2-lambda sink connector supports 25 options, which are listed below.
+The camel-aws2-lambda sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,9 +34,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.sink.path.function* | Name of the Lambda function. | null | true | HIGH
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.operation* | The operation to 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | 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
@@ -46,9 +48,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.component.aws2-lambda.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-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  [...]
 | *camel.component.aws2-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" | fal [...]
+| *camel.component.aws2-lambda.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-lambda.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-lambda.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.aws2-lambda.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-lambda.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.component.aws2-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
index e565b89..62e1ef9 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2mq.CamelAws2mqSinkConnector
 ----
 
 
-The camel-aws2-mq sink connector supports 25 options, which are listed below.
+The camel-aws2-mq sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonMqClient* | To use a existing configured AmazonMQClient as client | 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.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-mq.amazonMqClient* | To use a existing configured AmazonMQClient as client | null | false | MEDIUM
 | *camel.component.aws2-mq.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-mq.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-mq.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.component.aws2-mq.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-mq.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-mq.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-mq.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-mq.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-mq.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
index f993f6b..b17dc71 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2msk.CamelAws2mskSinkConnecto
 ----
 
 
-The camel-aws2-msk sink connector supports 25 options, which are listed below.
+The camel-aws2-msk sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-msk 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.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *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 lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-msk.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-msk.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-msk.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.component.aws2-msk.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.component.aws2-msk.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-msk.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-msk.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-msk.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-msk.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-msk.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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
 | *camel.component.aws2-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
index 597aa87..1a99602 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
@@ -34,7 +34,7 @@ The camel-aws2-s3 sink connector supports 59 options, which are listed below.
 | *camel.sink.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.sink.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | null | false | MEDIUM
@@ -62,7 +62,7 @@ The camel-aws2-s3 sink connector supports 59 options, which are listed below.
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-s3.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
index 909c149..81fb275 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
@@ -34,7 +34,7 @@ The camel-aws2-s3 source connector supports 85 options, which are listed below.
 | *camel.source.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.source.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.source.endpoint.policy* | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | null | false | MEDIUM
@@ -85,7 +85,7 @@ The camel-aws2-s3 source connector supports 85 options, which are listed below.
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
-| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
+| *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | false | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-s3.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
index 2ccc490..434ab72 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ses.CamelAws2sesSinkConnecto
 ----
 
 
-The camel-aws2-ses sink connector supports 29 options, which are listed below.
+The camel-aws2-ses sink connector supports 33 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.path.from* | The sender's email address. | null | true | HIGH
 | *camel.sink.endpoint.amazonSESClient* | To use the AmazonSimpleEmailService as the client | 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *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.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ses.amazonSESClient* | To use the AmazonSimpleEmailService as the client | null | false | MEDIUM
 | *camel.component.aws2-ses.configuration* | component configuration | null | false | MEDIUM
 | *camel.component.aws2-ses.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
+| *camel.component.aws2-ses.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ses.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -57,6 +60,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
 | *camel.component.aws2-ses.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ses.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-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.aws2-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
index 6d99dd6..f36dc00 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnecto
 ----
 
 
-The camel-aws2-sns sink connector supports 44 options, which are listed below.
+The camel-aws2-sns sink connector supports 48 options, which are listed below.
 
 
 
@@ -33,13 +33,14 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.topicNameOrArn* | Topic name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonSNSClient* | To use the AmazonSNS as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateTopic* | Setting the autocreation of the topic | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateTopic* | Setting the autocreation of the topic | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO Topic. 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 Topic. 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.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -50,17 +51,19 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sns.amazonSNSClient* | To use the AmazonSNS as the client | null | false | MEDIUM
-| *camel.component.aws2-sns.autoCreateTopic* | Setting the autocreation of the topic | true | false | MEDIUM
+| *camel.component.aws2-sns.autoCreateTopic* | Setting the autocreation of the topic | false | false | MEDIUM
 | *camel.component.aws2-sns.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-sns.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. | null | false | MEDIUM
 | *camel.component.aws2-sns.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sns.messageDeduplicationId Strategy* | Only for FIFO Topic. 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.aws2-sns.messageGroupIdStrategy* | Only for FIFO Topic. 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.aws2-sns.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.component.aws2-sns.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -71,6 +74,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sns.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
index 470c024..80d7a6f 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 54 options, which are listed below.
+The camel-aws2-sqs sink connector supports 60 options, which are listed below.
 
 
 
@@ -34,14 +34,17 @@ The camel-aws2-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.path.queueNameOrArn* | Queue name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.sink.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -60,14 +63,17 @@ The camel-aws2-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sqs.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
index 4b3169a..1f125b6 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 89 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -34,20 +34,22 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.path.queueNameOrArn* | Queue name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.source.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.source.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
 | *camel.source.endpoint.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM
 | *camel.source.endpoint.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM
-| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | MEDIUM
+| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM
 | *camel.source.endpoint.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM
 | *camel.source.endpoint.kmsDataKeyReusePeriodSeconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM
 | *camel.source.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM
@@ -87,20 +89,22 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sqs.amazonAWSHost* | The hostname of the Amazon AWS cloud. | "amazonaws.com" | false | MEDIUM
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
-| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
+| *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | false | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
 | *camel.component.aws2-sqs.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM
 | *camel.component.aws2-sqs.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM
-| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | MEDIUM
+| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM
 | *camel.component.aws2-sqs.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM
 | *camel.component.aws2-sqs.kmsDataKeyReusePeriod Seconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM
 | *camel.component.aws2-sqs.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sts-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sts-kafka-sink-connector.adoc
index 2702a1c..357feaf 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sts-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sts-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sts.CamelAws2stsSinkConnecto
 ----
 
 
-The camel-aws2-sts sink connector supports 25 options, which are listed below.
+The camel-aws2-sts sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
 | *camel.sink.path.label* | Logical name | null | true | HIGH
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.operation* | The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken] | "assumeRole" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the STS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the STS client | null | false | MEDIUM
@@ -41,11 +42,13 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which STS 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() | "aws-global" | false | MEDIUM
 | *camel.sink.endpoint.stsClient* | To use a existing configured AWS STS as client | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-sts.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-sts.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sts.operation* | The operation to perform One of: [assumeRole] [getSessionToken] [getFederationToken] | "assumeRole" | true | HIGH
+| *camel.component.aws2-sts.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sts.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-sts.proxyHost* | To define a proxy host when instantiating the STS client | null | false | MEDIUM
 | *camel.component.aws2-sts.proxyPort* | To define a proxy port when instantiating the STS client | null | false | MEDIUM
@@ -53,6 +56,7 @@ The camel-aws2-sts sink connector supports 25 options, which are listed below.
... 932 lines suppressed ...

[camel-kafka-connector] 08/09: Regen

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

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

commit 4d9cfd3589e0673fdd9c28f63e4b2ec321c5e6a0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:52:10 2021 +0200

    Regen
---
 .../camel-atmosphere-websocket-sink.json           |  21 --
 .../camel-atmosphere-websocket-source.json         |  28 +--
 ...nk.json => camel-aws-secrets-manager-sink.json} | 168 ++++++++-------
 .../resources/connectors/camel-aws2-cw-sink.json   |  26 +++
 .../resources/connectors/camel-aws2-ddb-sink.json  |  26 +++
 .../connectors/camel-aws2-ddbstream-source.json    |  26 +++
 .../resources/connectors/camel-aws2-ec2-sink.json  |  26 +++
 .../resources/connectors/camel-aws2-ecs-sink.json  |  26 +++
 .../resources/connectors/camel-aws2-eks-sink.json  |  26 +++
 .../connectors/camel-aws2-eventbridge-sink.json    |  26 +++
 .../resources/connectors/camel-aws2-iam-sink.json  |  26 +++
 .../resources/connectors/camel-aws2-kms-sink.json  |  26 +++
 .../connectors/camel-aws2-lambda-sink.json         |  26 +++
 .../resources/connectors/camel-aws2-mq-sink.json   |  26 +++
 .../resources/connectors/camel-aws2-msk-sink.json  |  26 +++
 .../resources/connectors/camel-aws2-s3-sink.json   |   4 +-
 .../resources/connectors/camel-aws2-s3-source.json |   4 +-
 .../resources/connectors/camel-aws2-ses-sink.json  |  26 +++
 .../resources/connectors/camel-aws2-sns-sink.json  |  30 ++-
 .../resources/connectors/camel-aws2-sqs-sink.json  |  44 +++-
 .../connectors/camel-aws2-sqs-source.json          |  34 ++-
 .../resources/connectors/camel-aws2-sts-sink.json  |  26 +++
 .../connectors/camel-aws2-translate-sink.json      |  26 +++
 .../resources/connectors/camel-file-sink.json      |   2 +-
 .../connectors/camel-freemarker-sink.json          |   7 +
 .../connectors/camel-google-bigquery-sql-sink.json |  12 +-
 ...-sink.json => camel-google-functions-sink.json} |  79 ++++---
 .../camel-google-mail-stream-source.json           |   4 +-
 .../connectors/camel-google-pubsub-sink.json       |  16 +-
 .../connectors/camel-google-pubsub-source.json     |  16 +-
 .../connectors/camel-google-storage-sink.json      | 154 ++++++++++++++
 ...ource.json => camel-google-storage-source.json} | 232 +++++++++------------
 .../resources/connectors/camel-http-sink.json      | 114 ++++++++--
 .../resources/connectors/camel-https-sink.json     | 114 ++++++++--
 .../resources/connectors/camel-jetty-source.json   |  40 ++--
 .../pom.xml                                        | 139 ++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-aws-secrets-manager-sink.json  | 168 ++++++++-------
 .../src/main/assembly/package.xml                  |  56 +++++
 ...l-aws-secrets-manager-kafka-sink-connector.adoc |  86 ++++++++
 .../CamelAwssecretsmanagerSinkConnector.properties |  37 ++++
 .../CamelAwssecretsmanagerSinkConnector.java       |  35 ++++
 .../CamelAwssecretsmanagerSinkConnectorConfig.java | 169 +++++++++++++++
 .../CamelAwssecretsmanagerSinkTask.java            |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 +
 .../camel-google-functions-kafka-connector/pom.xml | 139 ++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-google-functions-sink.json     |  79 ++++---
 .../src/main/assembly/package.xml                  |  56 +++++
 ...amel-google-functions-kafka-sink-connector.adoc |  65 ++++++
 .../CamelGooglefunctionsSinkConnector.properties   |  33 +++
 .../CamelGooglefunctionsSinkConnector.java         |  35 ++++
 .../CamelGooglefunctionsSinkConnectorConfig.java   |  85 ++++++++
 .../CamelGooglefunctionsSinkTask.java              |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 +
 .../camel-google-storage-kafka-connector/pom.xml   | 139 ++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../descriptors/connector-source.properties        |   1 +
 .../resources/camel-google-storage-sink.json       | 154 ++++++++++++++
 .../resources/camel-google-storage-source.json     | 232 +++++++++------------
 .../src/main/assembly/package.xml                  |  56 +++++
 .../camel-google-storage-kafka-sink-connector.adoc |  74 +++++++
 ...amel-google-storage-kafka-source-connector.adoc |  98 +++++++++
 .../CamelGooglestorageSinkConnector.properties     |  33 +++
 .../CamelGooglestorageSourceConnector.properties   |  33 +++
 .../CamelGooglestorageSinkConnector.java           |  35 ++++
 .../CamelGooglestorageSinkConnectorConfig.java     | 121 +++++++++++
 .../googlestorage/CamelGooglestorageSinkTask.java  |  39 ++++
 .../CamelGooglestorageSourceConnector.java         |  35 ++++
 .../CamelGooglestorageSourceConnectorConfig.java   | 217 +++++++++++++++++++
 .../CamelGooglestorageSourceTask.java              |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 +
 ...l-aws-secrets-manager-kafka-sink-connector.adoc |  86 ++++++++
 ...amel-google-functions-kafka-sink-connector.adoc |  65 ++++++
 .../camel-google-storage-kafka-sink-connector.adoc |  74 +++++++
 ...amel-google-storage-kafka-source-connector.adoc |  98 +++++++++
 79 files changed, 4453 insertions(+), 594 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
index d2cb75a..d8b4b95 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
@@ -76,27 +76,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.atmosphere-websocket.lazyStartProducer": {
 			"name": "camel.component.atmosphere-websocket.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
index 721d7e1..0c42ec2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
@@ -146,20 +146,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -181,6 +167,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.atmosphere-websocket.bridgeErrorHandler": {
 			"name": "camel.component.atmosphere-websocket.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json
similarity index 54%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
copy to camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json
index 58ea322..6c08ca8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json
@@ -1,12 +1,12 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.aws2translate.CamelAws2translateSinkConnector",
-		"artifactId": "camel-aws2-translate-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.awssecretsmanager.CamelAwssecretsmanagerSinkConnector",
+		"artifactId": "camel-aws-secrets-manager-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws2-translate-sink",
+		"id": "camel-aws-secrets-manager-sink",
 		"type": "sink",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Translate texts using AWS Translate and AWS SDK version 2.x."
+		"description": "Manage AWS Secrets Manager services using AWS SDK version 2.x."
 	},
 	"properties": {
 		"camel.sink.path.label": {
@@ -15,9 +15,9 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autodetectSourceLanguage": {
-			"name": "camel.sink.endpoint.autodetectSourceLanguage",
-			"description": "Being able to autodetect the source language",
+		"camel.sink.endpoint.binaryPayload": {
+			"name": "camel.sink.endpoint.binaryPayload",
+			"description": "Set if the secret is binary or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -31,14 +31,26 @@
 		},
 		"camel.sink.endpoint.operation": {
 			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform One of: [translateText]",
-			"defaultValue": "\"translateText\"",
+			"description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]",
 			"priority": "HIGH",
 			"required": "true",
 			"enum": [
-				"translateText"
+				"listSecrets",
+				"createSecret",
+				"getSecret",
+				"describeSecret",
+				"deleteSecret",
+				"rotateSecret",
+				"updateSecret"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -48,19 +60,19 @@
 		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the Translate client",
+			"description": "To define a proxy host when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.proxyPort": {
 			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the Translate client",
+			"description": "To define a proxy port when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.proxyProtocol": {
 			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Translate client One of: [HTTP] [HTTPS]",
+			"description": "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]",
 			"defaultValue": "\"HTTPS\"",
 			"priority": "MEDIUM",
 			"required": "false",
@@ -71,25 +83,13 @@
 		},
 		"camel.sink.endpoint.region": {
 			"name": "camel.sink.endpoint.region",
-			"description": "The region in which Translate 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.sourceLanguage": {
-			"name": "camel.sink.endpoint.sourceLanguage",
-			"description": "Source language to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.targetLanguage": {
-			"name": "camel.sink.endpoint.targetLanguage",
-			"description": "Target language to use",
+			"description": "The region in which Secrets Manager 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()",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.translateClient": {
-			"name": "camel.sink.endpoint.translateClient",
-			"description": "To use a existing configured AWS Translate as client",
+		"camel.sink.endpoint.secretsManagerClient": {
+			"name": "camel.sink.endpoint.secretsManagerClient",
+			"description": "To use a existing configured AWS Secrets Manager as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -100,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -112,58 +118,70 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autodetectSourceLanguage": {
-			"name": "camel.component.aws2-translate.autodetectSourceLanguage",
-			"description": "Being able to autodetect the source language",
+		"camel.component.aws-secrets-manager.binaryPayload": {
+			"name": "camel.component.aws-secrets-manager.binaryPayload",
+			"description": "Set if the secret is binary or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.configuration": {
-			"name": "camel.component.aws2-translate.configuration",
+		"camel.component.aws-secrets-manager.configuration": {
+			"name": "camel.component.aws-secrets-manager.configuration",
 			"description": "Component configuration",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.lazyStartProducer": {
-			"name": "camel.component.aws2-translate.lazyStartProducer",
+		"camel.component.aws-secrets-manager.lazyStartProducer": {
+			"name": "camel.component.aws-secrets-manager.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.operation": {
-			"name": "camel.component.aws2-translate.operation",
-			"description": "The operation to perform One of: [translateText]",
-			"defaultValue": "\"translateText\"",
+		"camel.component.aws-secrets-manager.operation": {
+			"name": "camel.component.aws-secrets-manager.operation",
+			"description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]",
 			"priority": "HIGH",
 			"required": "true",
 			"enum": [
-				"translateText"
+				"listSecrets",
+				"createSecret",
+				"getSecret",
+				"describeSecret",
+				"deleteSecret",
+				"rotateSecret",
+				"updateSecret"
 			]
 		},
-		"camel.component.aws2-translate.pojoRequest": {
-			"name": "camel.component.aws2-translate.pojoRequest",
+		"camel.component.aws-secrets-manager.overrideEndpoint": {
+			"name": "camel.component.aws-secrets-manager.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.aws-secrets-manager.pojoRequest": {
+			"name": "camel.component.aws-secrets-manager.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyHost": {
-			"name": "camel.component.aws2-translate.proxyHost",
-			"description": "To define a proxy host when instantiating the Translate client",
+		"camel.component.aws-secrets-manager.proxyHost": {
+			"name": "camel.component.aws-secrets-manager.proxyHost",
+			"description": "To define a proxy host when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyPort": {
-			"name": "camel.component.aws2-translate.proxyPort",
-			"description": "To define a proxy port when instantiating the Translate client",
+		"camel.component.aws-secrets-manager.proxyPort": {
+			"name": "camel.component.aws-secrets-manager.proxyPort",
+			"description": "To define a proxy port when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyProtocol": {
-			"name": "camel.component.aws2-translate.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Translate client One of: [HTTP] [HTTPS]",
+		"camel.component.aws-secrets-manager.proxyProtocol": {
+			"name": "camel.component.aws-secrets-manager.proxyProtocol",
+			"description": "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]",
 			"defaultValue": "\"HTTPS\"",
 			"priority": "MEDIUM",
 			"required": "false",
@@ -172,55 +190,49 @@
 				"HTTPS"
 			]
 		},
-		"camel.component.aws2-translate.region": {
-			"name": "camel.component.aws2-translate.region",
-			"description": "The region in which Translate 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws2-translate.sourceLanguage": {
-			"name": "camel.component.aws2-translate.sourceLanguage",
-			"description": "Source language to use",
+		"camel.component.aws-secrets-manager.region": {
+			"name": "camel.component.aws-secrets-manager.region",
+			"description": "The region in which Secrets Manager 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()",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.targetLanguage": {
-			"name": "camel.component.aws2-translate.targetLanguage",
-			"description": "Target language to use",
+		"camel.component.aws-secrets-manager.secretsManagerClient": {
+			"name": "camel.component.aws-secrets-manager.secretsManagerClient",
+			"description": "To use a existing configured AWS Secrets Manager as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.translateClient": {
-			"name": "camel.component.aws2-translate.translateClient",
-			"description": "To use a existing configured AWS Translate as client",
+		"camel.component.aws-secrets-manager.trustAllCertificates": {
+			"name": "camel.component.aws-secrets-manager.trustAllCertificates",
+			"description": "If we want to trust all certificates in case of overriding the endpoint",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.trustAllCertificates": {
-			"name": "camel.component.aws2-translate.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
-			"defaultValue": "false",
+		"camel.component.aws-secrets-manager.uriEndpointOverride": {
+			"name": "camel.component.aws-secrets-manager.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autowiredEnabled": {
-			"name": "camel.component.aws2-translate.autowiredEnabled",
+		"camel.component.aws-secrets-manager.autowiredEnabled": {
+			"name": "camel.component.aws-secrets-manager.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.accessKey": {
-			"name": "camel.component.aws2-translate.accessKey",
+		"camel.component.aws-secrets-manager.accessKey": {
+			"name": "camel.component.aws-secrets-manager.accessKey",
 			"description": "Amazon AWS Access Key",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.secretKey": {
-			"name": "camel.component.aws2-translate.secretKey",
+		"camel.component.aws-secrets-manager.secretKey": {
+			"name": "camel.component.aws-secrets-manager.secretKey",
 			"description": "Amazon AWS Secret Key",
 			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
index e52bdd2..6862b65 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
@@ -34,6 +34,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -82,6 +89,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.value": {
 			"name": "camel.sink.endpoint.value",
 			"description": "The metric value",
@@ -125,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.overrideEndpoint": {
+			"name": "camel.component.aws2-cw.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.proxyHost": {
 			"name": "camel.component.aws2-cw.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.uriEndpointOverride": {
+			"name": "camel.component.aws2-cw.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.value": {
 			"name": "camel.component.aws2-cw.value",
 			"description": "The metric value",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
index ee6819a..4b9f96b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
@@ -66,6 +66,13 @@
 				"UpdateTable"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -108,6 +115,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.writeCapacity": {
 			"name": "camel.sink.endpoint.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
@@ -183,6 +196,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.component.aws2-ddb.overrideEndpoint": {
+			"name": "camel.component.aws2-ddb.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.proxyHost": {
 			"name": "camel.component.aws2-ddb.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -225,6 +245,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddb.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddb.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.writeCapacity": {
 			"name": "camel.component.aws2-ddb.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
index 055f135..11afb82 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
@@ -48,6 +48,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.proxyHost": {
 			"name": "camel.source.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -97,6 +104,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -281,6 +294,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.overrideEndpoint": {
+			"name": "camel.component.aws2-ddbstream.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.proxyHost": {
 			"name": "camel.component.aws2-ddbstream.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -323,6 +343,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddbstream.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"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.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
index 5407786..74926ea 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
@@ -53,6 +53,13 @@
 				"deleteTags"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -102,6 +109,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -146,6 +159,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.component.aws2-ec2.overrideEndpoint": {
+			"name": "camel.component.aws2-ec2.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.pojoRequest": {
 			"name": "camel.component.aws2-ec2.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ec2.uriEndpointOverride": {
+			"name": "camel.component.aws2-ec2.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.autowiredEnabled": {
 			"name": "camel.component.aws2-ec2.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
index 60749a6..7003584 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-ecs.overrideEndpoint": {
+			"name": "camel.component.aws2-ecs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.pojoRequest": {
 			"name": "camel.component.aws2-ecs.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ecs.uriEndpointOverride": {
+			"name": "camel.component.aws2-ecs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.autowiredEnabled": {
 			"name": "camel.component.aws2-ecs.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
index 903214c..6815882 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-eks.overrideEndpoint": {
+			"name": "camel.component.aws2-eks.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.pojoRequest": {
 			"name": "camel.component.aws2-eks.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eks.uriEndpointOverride": {
+			"name": "camel.component.aws2-eks.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.autowiredEnabled": {
 			"name": "camel.component.aws2-eks.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
index dbe8f00..31dc703 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
@@ -53,6 +53,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -96,6 +103,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -152,6 +165,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.component.aws2-eventbridge.overrideEndpoint": {
+			"name": "camel.component.aws2-eventbridge.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.pojoRequest": {
 			"name": "camel.component.aws2-eventbridge.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eventbridge.uriEndpointOverride": {
+			"name": "camel.component.aws2-eventbridge.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.autowiredEnabled": {
 			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
index bf4a377..ef28770 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
@@ -49,6 +49,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -93,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -145,6 +158,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.component.aws2-iam.overrideEndpoint": {
+			"name": "camel.component.aws2-iam.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.pojoRequest": {
 			"name": "camel.component.aws2-iam.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -189,6 +209,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-iam.uriEndpointOverride": {
+			"name": "camel.component.aws2-iam.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.autowiredEnabled": {
 			"name": "camel.component.aws2-iam.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
index 6bda133..972405c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
@@ -42,6 +42,13 @@
 				"enableKey"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"enableKey"
 			]
 		},
+		"camel.component.aws2-kms.overrideEndpoint": {
+			"name": "camel.component.aws2-kms.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.pojoRequest": {
 			"name": "camel.component.aws2-kms.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-kms.uriEndpointOverride": {
+			"name": "camel.component.aws2-kms.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.autowiredEnabled": {
 			"name": "camel.component.aws2-kms.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
index 40b5cac..9f3f3b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
@@ -49,6 +49,13 @@
 				"listVersions"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -69,6 +76,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.awsLambdaClient": {
 			"name": "camel.sink.endpoint.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
@@ -150,6 +163,13 @@
 				"listVersions"
 			]
 		},
+		"camel.component.aws2-lambda.overrideEndpoint": {
+			"name": "camel.component.aws2-lambda.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.pojoRequest": {
 			"name": "camel.component.aws2-lambda.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -170,6 +190,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.uriEndpointOverride": {
+			"name": "camel.component.aws2-lambda.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.autowiredEnabled": {
 			"name": "camel.component.aws2-lambda.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
index c4a0c68..b3726e5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
@@ -42,6 +42,13 @@
 				"describeBroker"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.component.aws2-mq.overrideEndpoint": {
+			"name": "camel.component.aws2-mq.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.pojoRequest": {
 			"name": "camel.component.aws2-mq.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-mq.uriEndpointOverride": {
+			"name": "camel.component.aws2-mq.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.autowiredEnabled": {
 			"name": "camel.component.aws2-mq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
index b12150a..8ea8509 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
@@ -40,6 +40,13 @@
 				"describeCluster"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.component.aws2-msk.overrideEndpoint": {
+			"name": "camel.component.aws2-msk.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.pojoRequest": {
 			"name": "camel.component.aws2-msk.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-msk.uriEndpointOverride": {
+			"name": "camel.component.aws2-msk.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.autowiredEnabled": {
 			"name": "camel.component.aws2-msk.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
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 9e183fa..e5674e6 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
@@ -30,7 +30,7 @@
 		"camel.sink.endpoint.autoCreateBucket": {
 			"name": "camel.sink.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -223,7 +223,7 @@
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
index 8621e81..d1169e8 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
@@ -30,7 +30,7 @@
 		"camel.source.endpoint.autoCreateBucket": {
 			"name": "camel.source.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -386,7 +386,7 @@
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
index e213542..cf18cf1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
@@ -28,6 +28,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -88,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -119,6 +132,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.overrideEndpoint": {
+			"name": "camel.component.aws2-ses.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.proxyHost": {
 			"name": "camel.component.aws2-ses.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -179,6 +199,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.uriEndpointOverride": {
+			"name": "camel.component.aws2-ses.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.autowiredEnabled": {
 			"name": "camel.component.aws2-ses.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
index 123aec7..0ef5538 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
@@ -24,7 +24,7 @@
 		"camel.sink.endpoint.autoCreateTopic": {
 			"name": "camel.sink.endpoint.autoCreateTopic",
 			"description": "Setting the autocreation of the topic",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -75,6 +75,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.policy": {
 			"name": "camel.sink.endpoint.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -143,6 +150,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -171,7 +184,7 @@
 		"camel.component.aws2-sns.autoCreateTopic": {
 			"name": "camel.component.aws2-sns.autoCreateTopic",
 			"description": "Setting the autocreation of the topic",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -222,6 +235,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.overrideEndpoint": {
+			"name": "camel.component.aws2-sns.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.policy": {
 			"name": "camel.component.aws2-sns.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -290,6 +310,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.uriEndpointOverride": {
+			"name": "camel.component.aws2-sns.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
index 6f06f26..8272ee5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
@@ -31,7 +31,7 @@
 		"camel.sink.endpoint.autoCreateQueue": {
 			"name": "camel.sink.endpoint.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -41,6 +41,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.protocol": {
 			"name": "camel.sink.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -85,6 +98,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.batchSeparator": {
+			"name": "camel.sink.endpoint.batchSeparator",
+			"description": "Set the separator when passing a String to send batch message operation",
+			"defaultValue": "\",\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -215,7 +235,7 @@
 		"camel.component.aws2-sqs.autoCreateQueue": {
 			"name": "camel.component.aws2-sqs.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -225,6 +245,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -262,6 +289,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -269,6 +302,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.batchSeparator": {
+			"name": "camel.component.aws2-sqs.batchSeparator",
+			"description": "Set the separator when passing a String to send batch message operation",
+			"defaultValue": "\",\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
index 5f56d2f..0dc497c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
@@ -31,7 +31,7 @@
 		"camel.source.endpoint.autoCreateQueue": {
 			"name": "camel.source.endpoint.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -41,6 +41,13 @@
 			"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.protocol": {
 			"name": "camel.source.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -120,7 +133,7 @@
 		},
 		"camel.source.endpoint.deleteIfFiltered": {
 			"name": "camel.source.endpoint.deleteIfFiltered",
-			"description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.",
+			"description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -398,7 +411,7 @@
 		"camel.component.aws2-sqs.autoCreateQueue": {
 			"name": "camel.component.aws2-sqs.autoCreateQueue",
 			"description": "Setting the autocreation of the queue",
-			"defaultValue": "true",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -408,6 +421,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -445,6 +465,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -487,7 +513,7 @@
 		},
 		"camel.component.aws2-sqs.deleteIfFiltered": {
 			"name": "camel.component.aws2-sqs.deleteIfFiltered",
-			"description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.",
+			"description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
index 95ad11b..2407404 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
@@ -34,6 +34,13 @@
 				"getFederationToken"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -84,6 +91,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -121,6 +134,13 @@
 				"getFederationToken"
 			]
 		},
+		"camel.component.aws2-sts.overrideEndpoint": {
+			"name": "camel.component.aws2-sts.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sts.pojoRequest": {
 			"name": "camel.component.aws2-sts.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -171,6 +191,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sts.uriEndpointOverride": {
+			"name": "camel.component.aws2-sts.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sts.autowiredEnabled": {
 			"name": "camel.component.aws2-sts.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
index 58ea322..2fcd8ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
@@ -39,6 +39,13 @@
 				"translateText"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -100,6 +107,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -142,6 +155,13 @@
 				"translateText"
 			]
 		},
+		"camel.component.aws2-translate.overrideEndpoint": {
+			"name": "camel.component.aws2-translate.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-translate.pojoRequest": {
 			"name": "camel.component.aws2-translate.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -203,6 +223,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-translate.uriEndpointOverride": {
+			"name": "camel.component.aws2-translate.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-translate.autowiredEnabled": {
 			"name": "camel.component.aws2-translate.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
index a4faf60..1d99852 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
@@ -35,7 +35,7 @@
 		},
 		"camel.sink.endpoint.appendChars": {
 			"name": "camel.sink.endpoint.appendChars",
-			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
+			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
index 088ef5d..7f77c26 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
@@ -82,6 +82,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.freemarker.localizedLookup": {
+			"name": "camel.component.freemarker.localizedLookup",
+			"description": "Enables\/disables localized template lookup. Disabled by default.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.freemarker.autowiredEnabled": {
 			"name": "camel.component.freemarker.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
index b80d60c..883c3d0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
@@ -9,18 +9,18 @@
 		"description": "Access Google Cloud BigQuery service using SQL queries."
 	},
 	"properties": {
-		"camel.sink.path.query": {
-			"name": "camel.sink.path.query",
-			"description": "BigQuery standard SQL query",
-			"priority": "HIGH",
-			"required": "true"
-		},
 		"camel.sink.path.projectId": {
 			"name": "camel.sink.path.projectId",
 			"description": "Google Cloud Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.path.queryString": {
+			"name": "camel.sink.path.queryString",
+			"description": "BigQuery standard SQL query",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
 			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-functions-sink.json
similarity index 50%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
copy to camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-functions-sink.json
index b80d60c..92708d7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-functions-sink.json
@@ -1,29 +1,23 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.googlebigquerysql.CamelGooglebigquerysqlSinkConnector",
-		"artifactId": "camel-google-bigquery-sql-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.googlefunctions.CamelGooglefunctionsSinkConnector",
+		"artifactId": "camel-google-functions-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-google-bigquery-sql-sink",
+		"id": "camel-google-functions-sink",
 		"type": "sink",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Access Google Cloud BigQuery service using SQL queries."
+		"description": "Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library."
 	},
 	"properties": {
-		"camel.sink.path.query": {
-			"name": "camel.sink.path.query",
-			"description": "BigQuery standard SQL query",
+		"camel.sink.path.functionName": {
+			"name": "camel.sink.path.functionName",
+			"description": "The user-defined name of the function",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.path.projectId": {
-			"name": "camel.sink.path.projectId",
-			"description": "Google Cloud Project Id",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.connectionFactory": {
-			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "Service account key to authenticate an application as a service account",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -34,31 +28,60 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.connectionFactory": {
-			"name": "camel.component.google-bigquery-sql.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
+		"camel.sink.endpoint.location": {
+			"name": "camel.sink.endpoint.location",
+			"description": "The Google Cloud Location (Region) where the Function is located",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.lazyStartProducer": {
-			"name": "camel.component.google-bigquery-sql.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 [...]
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to perform on the producer. One of: [listFunctions] [getFunction] [callFunction] [generateDownloadUrl] [generateUploadUrl] [createFunction] [updateFunction] [deleteFunction]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"listFunctions",
+				"getFunction",
+				"callFunction",
+				"generateDownloadUrl",
+				"generateUploadUrl",
+				"createFunction",
+				"updateFunction",
+				"deleteFunction"
+			]
+		},
+		"camel.sink.endpoint.pojoRequest": {
+			"name": "camel.sink.endpoint.pojoRequest",
+			"description": "Specifies if the request is a pojo request",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.projectId": {
-			"name": "camel.component.google-bigquery-sql.projectId",
-			"description": "Google Cloud Project Id",
+		"camel.sink.endpoint.project": {
+			"name": "camel.sink.endpoint.project",
+			"description": "The Google Cloud Project name where the Function is located",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.client": {
+			"name": "camel.sink.endpoint.client",
+			"description": "The client to use during service invocation.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-functions.lazyStartProducer": {
+			"name": "camel.component.google-functions.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.autowiredEnabled": {
-			"name": "camel.component.google-bigquery-sql.autowiredEnabled",
+		"camel.component.google-functions.autowiredEnabled": {
+			"name": "camel.component.google-functions.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
index a5baa63..dc63bee 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
@@ -43,7 +43,7 @@
 		"camel.source.endpoint.markAsRead": {
 			"name": "camel.source.endpoint.markAsRead",
 			"description": "Mark the message as read once it has been consumed",
-			"defaultValue": "false",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -247,7 +247,7 @@
 		"camel.component.google-mail-stream.markAsRead": {
 			"name": "camel.component.google-mail-stream.markAsRead",
 			"description": "Mark the message as read once it has been consumed",
-			"defaultValue": "false",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
index e932581..ae5d4c8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
@@ -11,13 +11,13 @@
 	"properties": {
 		"camel.sink.path.projectId": {
 			"name": "camel.sink.path.projectId",
-			"description": "Project Id",
+			"description": "The Google Cloud PubSub Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
 		"camel.sink.path.destinationName": {
 			"name": "camel.sink.path.destinationName",
-			"description": "Destination Name",
+			"description": "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.sink.endpoint.synchronousPull": {
 			"name": "camel.sink.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
@@ -91,6 +97,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.google-pubsub.serviceAccountKey": {
+			"name": "camel.component.google-pubsub.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.component.google-pubsub.lazyStartProducer": {
 			"name": "camel.component.google-pubsub.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
index 5f7616a..2d15f15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
@@ -11,13 +11,13 @@
 	"properties": {
 		"camel.source.path.projectId": {
 			"name": "camel.source.path.projectId",
-			"description": "Project Id",
+			"description": "The Google Cloud PubSub Project Id",
 			"priority": "HIGH",
 			"required": "true"
 		},
 		"camel.source.path.destinationName": {
 			"name": "camel.source.path.destinationName",
-			"description": "Destination Name",
+			"description": "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.source.endpoint.synchronousPull": {
 			"name": "camel.source.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
@@ -89,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.google-pubsub.serviceAccountKey": {
+			"name": "camel.component.google-pubsub.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.component.google-pubsub.bridgeErrorHandler": {
 			"name": "camel.component.google-pubsub.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
new file mode 100644
index 0000000..2b14c85
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
@@ -0,0 +1,154 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSinkConnector",
+		"artifactId": "camel-google-storage-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-google-storage-sink",
+		"type": "sink",
+		"version": "0.9.0-SNAPSHOT",
+		"description": "Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library."
+	},
+	"properties": {
+		"camel.sink.path.bucketName": {
+			"name": "camel.sink.path.bucketName",
+			"description": "Bucket name or ARN",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.autoCreateBucket": {
+			"name": "camel.sink.endpoint.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageClass": {
+			"name": "camel.sink.endpoint.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageClient": {
+			"name": "camel.sink.endpoint.storageClient",
+			"description": "The storage client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageLocation": {
+			"name": "camel.sink.endpoint.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.objectName": {
+			"name": "camel.sink.endpoint.objectName",
+			"description": "The Object name inside the bucket",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"copyObject",
+				"listObjects",
+				"deleteObject",
+				"deleteBucket",
+				"listBuckets",
+				"getObject",
+				"createDownloadLink"
+			]
+		},
+		"camel.component.google-storage.autoCreateBucket": {
+			"name": "camel.component.google-storage.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.configuration": {
+			"name": "camel.component.google-storage.configuration",
+			"description": "The component configuration",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.serviceAccountKey": {
+			"name": "camel.component.google-storage.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageClass": {
+			"name": "camel.component.google-storage.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageClient": {
+			"name": "camel.component.google-storage.storageClient",
+			"description": "The storage client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageLocation": {
+			"name": "camel.component.google-storage.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.lazyStartProducer": {
+			"name": "camel.component.google-storage.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.objectName": {
+			"name": "camel.component.google-storage.objectName",
+			"description": "The Object name inside the bucket",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.operation": {
+			"name": "camel.component.google-storage.operation",
+			"description": "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"copyObject",
+				"listObjects",
+				"deleteObject",
+				"deleteBucket",
+				"listBuckets",
+				"getObject",
+				"createDownloadLink"
+			]
+		},
+		"camel.component.google-storage.autowiredEnabled": {
+			"name": "camel.component.google-storage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
similarity index 58%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
copy to camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
index 055f135..c7e7297 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
@@ -1,98 +1,97 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstreamSourceConnector",
-		"artifactId": "camel-aws2-ddbstream-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSourceConnector",
+		"artifactId": "camel-google-storage-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws2-ddbstream-source",
+		"id": "camel-google-storage-source",
 		"type": "source",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x."
+		"description": "Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library."
 	},
 	"properties": {
-		"camel.source.path.tableName": {
-			"name": "camel.source.path.tableName",
-			"description": "Name of the dynamodb table",
+		"camel.source.path.bucketName": {
+			"name": "camel.source.path.bucketName",
+			"description": "Bucket name or ARN",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
-			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
-			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
+		"camel.source.endpoint.autoCreateBucket": {
+			"name": "camel.source.endpoint.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.bridgeErrorHandler": {
-			"name": "camel.source.endpoint.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.iteratorType": {
-			"name": "camel.source.endpoint.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
+		"camel.source.endpoint.storageClass": {
+			"name": "camel.source.endpoint.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"null"
-			]
+			"required": "false"
 		},
-		"camel.source.endpoint.maxResultsPerRequest": {
-			"name": "camel.source.endpoint.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
+		"camel.source.endpoint.storageClient": {
+			"name": "camel.source.endpoint.storageClient",
+			"description": "The storage client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyHost": {
-			"name": "camel.source.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
+		"camel.source.endpoint.storageLocation": {
+			"name": "camel.source.endpoint.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.bridgeErrorHandler": {
+			"name": "camel.source.endpoint.bridgeErrorHandler",
+			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyPort": {
-			"name": "camel.source.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
+		"camel.source.endpoint.deleteAfterRead": {
+			"name": "camel.source.endpoint.deleteAfterRead",
+			"description": "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyProtocol": {
-			"name": "camel.source.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
+		"camel.source.endpoint.destinationBucket": {
+			"name": "camel.source.endpoint.destinationBucket",
+			"description": "Define the destination bucket where an object must be moved when moveAfterRead is set to true.",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
+			"required": "false"
 		},
-		"camel.source.endpoint.region": {
-			"name": "camel.source.endpoint.region",
-			"description": "The region in which DDBStreams client needs to work",
+		"camel.source.endpoint.includeBody": {
+			"name": "camel.source.endpoint.includeBody",
+			"description": "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
-			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
-			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
-			"defaultValue": "false",
+		"camel.source.endpoint.includeFolders": {
+			"name": "camel.source.endpoint.includeFolders",
+			"description": "If it is true, the folders\/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.sequenceNumberProvider": {
-			"name": "camel.source.endpoint.sequenceNumberProvider",
-			"description": "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.",
+		"camel.source.endpoint.moveAfterRead": {
+			"name": "camel.source.endpoint.moveAfterRead",
+			"description": "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.trustAllCertificates": {
-			"name": "camel.source.endpoint.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
+		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
+			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
+			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -230,117 +229,92 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.accessKey": {
-			"name": "camel.source.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
+		"camel.component.google-storage.autoCreateBucket": {
+			"name": "camel.component.google-storage.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.secretKey": {
-			"name": "camel.source.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
+		"camel.component.google-storage.configuration": {
+			"name": "camel.component.google-storage.configuration",
+			"description": "The component configuration",
 			"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",
+		"camel.component.google-storage.serviceAccountKey": {
+			"name": "camel.component.google-storage.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.bridgeErrorHandler": {
-			"name": "camel.component.aws2-ddbstream.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
+		"camel.component.google-storage.storageClass": {
+			"name": "camel.component.google-storage.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.configuration": {
-			"name": "camel.component.aws2-ddbstream.configuration",
-			"description": "The component configuration",
+		"camel.component.google-storage.storageClient": {
+			"name": "camel.component.google-storage.storageClient",
+			"description": "The storage client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.iteratorType": {
-			"name": "camel.component.aws2-ddbstream.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"null"
-			]
-		},
-		"camel.component.aws2-ddbstream.maxResultsPerRequest": {
-			"name": "camel.component.aws2-ddbstream.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
+		"camel.component.google-storage.storageLocation": {
+			"name": "camel.component.google-storage.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyHost": {
-			"name": "camel.component.aws2-ddbstream.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
+		"camel.component.google-storage.bridgeErrorHandler": {
+			"name": "camel.component.google-storage.bridgeErrorHandler",
+			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyPort": {
-			"name": "camel.component.aws2-ddbstream.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
+		"camel.component.google-storage.deleteAfterRead": {
+			"name": "camel.component.google-storage.deleteAfterRead",
+			"description": "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyProtocol": {
-			"name": "camel.component.aws2-ddbstream.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
+		"camel.component.google-storage.destinationBucket": {
+			"name": "camel.component.google-storage.destinationBucket",
+			"description": "Define the destination bucket where an object must be moved when moveAfterRead is set to true.",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
+			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.region": {
-			"name": "camel.component.aws2-ddbstream.region",
-			"description": "The region in which DDBStreams client needs to work",
+		"camel.component.google-storage.includeBody": {
+			"name": "camel.component.google-storage.includeBody",
+			"description": "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.sequenceNumberProvider": {
-			"name": "camel.component.aws2-ddbstream.sequenceNumberProvider",
-			"description": "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.",
+		"camel.component.google-storage.includeFolders": {
+			"name": "camel.component.google-storage.includeFolders",
+			"description": "If it is true, the folders\/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.trustAllCertificates": {
-			"name": "camel.component.aws2-ddbstream.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
+		"camel.component.google-storage.moveAfterRead": {
+			"name": "camel.component.google-storage.moveAfterRead",
+			"description": "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autowiredEnabled": {
-			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+		"camel.component.google-storage.autowiredEnabled": {
+			"name": "camel.component.google-storage.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. 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": {
-			"name": "camel.component.aws2-ddbstream.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws2-ddbstream.secretKey": {
-			"name": "camel.component.aws2-ddbstream.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
index 6f1ae7a..7ab2e41 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -202,27 +216,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maxTotalConnections": {
 			"name": "camel.sink.endpoint.maxTotalConnections",
 			"description": "The maximum number of connections.",
@@ -372,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.copyHeaders": {
+			"name": "camel.component.http.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.lazyStartProducer": {
 			"name": "camel.component.http.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 [...]
@@ -379,6 +379,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.responsePayloadStreamingThreshold": {
+			"name": "camel.component.http.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipRequestHeaders": {
+			"name": "camel.component.http.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipResponseHeaders": {
+			"name": "camel.component.http.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.allowJavaSerializedObject": {
 			"name": "camel.component.http.allowJavaSerializedObject",
 			"description": "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.",
@@ -386,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.authCachingDisabled": {
+			"name": "camel.component.http.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.automaticRetriesDisabled": {
+			"name": "camel.component.http.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.autowiredEnabled": {
 			"name": "camel.component.http.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -406,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.connectionStateDisabled": {
+			"name": "camel.component.http.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.connectionTimeToLive": {
 			"name": "camel.component.http.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.contentCompressionDisabled": {
+			"name": "camel.component.http.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.cookieManagementDisabled": {
+			"name": "camel.component.http.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.defaultUserAgentDisabled": {
+			"name": "camel.component.http.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.httpBinding": {
 			"name": "camel.component.http.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -443,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.redirectHandlingDisabled": {
+			"name": "camel.component.http.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.headerFilterStrategy": {
 			"name": "camel.component.http.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
index e592f2f..9cf955c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -202,27 +216,6 @@
 			"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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody": {
-			"name": "camel.sink.endpoint.mapHttpMessageFormUrlEncodedBody",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.mapHttpMessageHeaders": {
-			"name": "camel.sink.endpoint.mapHttpMessageHeaders",
-			"description": "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.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maxTotalConnections": {
 			"name": "camel.sink.endpoint.maxTotalConnections",
 			"description": "The maximum number of connections.",
@@ -372,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.copyHeaders": {
+			"name": "camel.component.https.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.lazyStartProducer": {
 			"name": "camel.component.https.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 [...]
@@ -379,6 +379,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.responsePayloadStreamingThreshold": {
+			"name": "camel.component.https.responsePayloadStreamingThreshold",
+			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
+			"defaultValue": "8192",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipRequestHeaders": {
+			"name": "camel.component.https.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipResponseHeaders": {
+			"name": "camel.component.https.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "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.",
@@ -386,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.authCachingDisabled": {
+			"name": "camel.component.https.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.automaticRetriesDisabled": {
+			"name": "camel.component.https.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.autowiredEnabled": {
 			"name": "camel.component.https.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -406,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.connectionStateDisabled": {
+			"name": "camel.component.https.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.connectionTimeToLive": {
 			"name": "camel.component.https.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.contentCompressionDisabled": {
+			"name": "camel.component.https.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.cookieManagementDisabled": {
+			"name": "camel.component.https.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.defaultUserAgentDisabled": {
+			"name": "camel.component.https.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.httpBinding": {
 			"name": "camel.component.https.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -443,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.redirectHandlingDisabled": {
+			"name": "camel.component.https.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jetty-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jetty-source.json
index c4f030d..2aa8c82 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jetty-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jetty-source.json
@@ -185,26 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.multipartFilter": {
-			"name": "camel.source.endpoint.multipartFilter",
-			"description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.optionsEnabled": {
-			"name": "camel.source.endpoint.optionsEnabled",
-			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.traceEnabled": {
-			"name": "camel.source.endpoint.traceEnabled",
-			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
-			"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.",
@@ -226,6 +206,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.multipartFilter": {
+			"name": "camel.source.endpoint.multipartFilter",
+			"description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.optionsEnabled": {
+			"name": "camel.source.endpoint.optionsEnabled",
+			"description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.traceEnabled": {
+			"name": "camel.source.endpoint.traceEnabled",
+			"description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sslContextParameters": {
 			"name": "camel.source.endpoint.sslContextParameters",
 			"description": "To configure security using SSLContextParameters",
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/pom.xml b/connectors/camel-aws-secrets-manager-kafka-connector/pom.xml
new file mode 100644
index 0000000..4c24583
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/pom.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-aws-secrets-manager-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: aws-secrets-manager</name>
+  <description>Camel Kafka Connector for aws-secrets-manager</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-aws-secrets-manager</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jackson</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..bf8c526
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-aws-secrets-manager-sink
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json
similarity index 54%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
copy to connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json
index 58ea322..6c08ca8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json
@@ -1,12 +1,12 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.aws2translate.CamelAws2translateSinkConnector",
-		"artifactId": "camel-aws2-translate-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.awssecretsmanager.CamelAwssecretsmanagerSinkConnector",
+		"artifactId": "camel-aws-secrets-manager-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws2-translate-sink",
+		"id": "camel-aws-secrets-manager-sink",
 		"type": "sink",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Translate texts using AWS Translate and AWS SDK version 2.x."
+		"description": "Manage AWS Secrets Manager services using AWS SDK version 2.x."
 	},
 	"properties": {
 		"camel.sink.path.label": {
@@ -15,9 +15,9 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autodetectSourceLanguage": {
-			"name": "camel.sink.endpoint.autodetectSourceLanguage",
-			"description": "Being able to autodetect the source language",
+		"camel.sink.endpoint.binaryPayload": {
+			"name": "camel.sink.endpoint.binaryPayload",
+			"description": "Set if the secret is binary or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -31,14 +31,26 @@
 		},
 		"camel.sink.endpoint.operation": {
 			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform One of: [translateText]",
-			"defaultValue": "\"translateText\"",
+			"description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]",
 			"priority": "HIGH",
 			"required": "true",
 			"enum": [
-				"translateText"
+				"listSecrets",
+				"createSecret",
+				"getSecret",
+				"describeSecret",
+				"deleteSecret",
+				"rotateSecret",
+				"updateSecret"
 			]
 		},
+		"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",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -48,19 +60,19 @@
 		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the Translate client",
+			"description": "To define a proxy host when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.proxyPort": {
 			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the Translate client",
+			"description": "To define a proxy port when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.proxyProtocol": {
 			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Translate client One of: [HTTP] [HTTPS]",
+			"description": "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]",
 			"defaultValue": "\"HTTPS\"",
 			"priority": "MEDIUM",
 			"required": "false",
@@ -71,25 +83,13 @@
 		},
 		"camel.sink.endpoint.region": {
 			"name": "camel.sink.endpoint.region",
-			"description": "The region in which Translate 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.sourceLanguage": {
-			"name": "camel.sink.endpoint.sourceLanguage",
-			"description": "Source language to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.targetLanguage": {
-			"name": "camel.sink.endpoint.targetLanguage",
-			"description": "Target language to use",
+			"description": "The region in which Secrets Manager 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()",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.translateClient": {
-			"name": "camel.sink.endpoint.translateClient",
-			"description": "To use a existing configured AWS Translate as client",
+		"camel.sink.endpoint.secretsManagerClient": {
+			"name": "camel.sink.endpoint.secretsManagerClient",
+			"description": "To use a existing configured AWS Secrets Manager as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -100,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -112,58 +118,70 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autodetectSourceLanguage": {
-			"name": "camel.component.aws2-translate.autodetectSourceLanguage",
-			"description": "Being able to autodetect the source language",
+		"camel.component.aws-secrets-manager.binaryPayload": {
+			"name": "camel.component.aws-secrets-manager.binaryPayload",
+			"description": "Set if the secret is binary or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.configuration": {
-			"name": "camel.component.aws2-translate.configuration",
+		"camel.component.aws-secrets-manager.configuration": {
+			"name": "camel.component.aws-secrets-manager.configuration",
 			"description": "Component configuration",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.lazyStartProducer": {
-			"name": "camel.component.aws2-translate.lazyStartProducer",
+		"camel.component.aws-secrets-manager.lazyStartProducer": {
+			"name": "camel.component.aws-secrets-manager.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.operation": {
-			"name": "camel.component.aws2-translate.operation",
-			"description": "The operation to perform One of: [translateText]",
-			"defaultValue": "\"translateText\"",
+		"camel.component.aws-secrets-manager.operation": {
+			"name": "camel.component.aws-secrets-manager.operation",
+			"description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]",
 			"priority": "HIGH",
 			"required": "true",
 			"enum": [
-				"translateText"
+				"listSecrets",
+				"createSecret",
+				"getSecret",
+				"describeSecret",
+				"deleteSecret",
+				"rotateSecret",
+				"updateSecret"
 			]
 		},
-		"camel.component.aws2-translate.pojoRequest": {
-			"name": "camel.component.aws2-translate.pojoRequest",
+		"camel.component.aws-secrets-manager.overrideEndpoint": {
+			"name": "camel.component.aws-secrets-manager.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.aws-secrets-manager.pojoRequest": {
+			"name": "camel.component.aws-secrets-manager.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyHost": {
-			"name": "camel.component.aws2-translate.proxyHost",
-			"description": "To define a proxy host when instantiating the Translate client",
+		"camel.component.aws-secrets-manager.proxyHost": {
+			"name": "camel.component.aws-secrets-manager.proxyHost",
+			"description": "To define a proxy host when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyPort": {
-			"name": "camel.component.aws2-translate.proxyPort",
-			"description": "To define a proxy port when instantiating the Translate client",
+		"camel.component.aws-secrets-manager.proxyPort": {
+			"name": "camel.component.aws-secrets-manager.proxyPort",
+			"description": "To define a proxy port when instantiating the Secrets Manager client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.proxyProtocol": {
-			"name": "camel.component.aws2-translate.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Translate client One of: [HTTP] [HTTPS]",
+		"camel.component.aws-secrets-manager.proxyProtocol": {
+			"name": "camel.component.aws-secrets-manager.proxyProtocol",
+			"description": "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]",
 			"defaultValue": "\"HTTPS\"",
 			"priority": "MEDIUM",
 			"required": "false",
@@ -172,55 +190,49 @@
 				"HTTPS"
 			]
 		},
-		"camel.component.aws2-translate.region": {
-			"name": "camel.component.aws2-translate.region",
-			"description": "The region in which Translate 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws2-translate.sourceLanguage": {
-			"name": "camel.component.aws2-translate.sourceLanguage",
-			"description": "Source language to use",
+		"camel.component.aws-secrets-manager.region": {
+			"name": "camel.component.aws-secrets-manager.region",
+			"description": "The region in which Secrets Manager 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()",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.targetLanguage": {
-			"name": "camel.component.aws2-translate.targetLanguage",
-			"description": "Target language to use",
+		"camel.component.aws-secrets-manager.secretsManagerClient": {
+			"name": "camel.component.aws-secrets-manager.secretsManagerClient",
+			"description": "To use a existing configured AWS Secrets Manager as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.translateClient": {
-			"name": "camel.component.aws2-translate.translateClient",
-			"description": "To use a existing configured AWS Translate as client",
+		"camel.component.aws-secrets-manager.trustAllCertificates": {
+			"name": "camel.component.aws-secrets-manager.trustAllCertificates",
+			"description": "If we want to trust all certificates in case of overriding the endpoint",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.trustAllCertificates": {
-			"name": "camel.component.aws2-translate.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
-			"defaultValue": "false",
+		"camel.component.aws-secrets-manager.uriEndpointOverride": {
+			"name": "camel.component.aws-secrets-manager.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autowiredEnabled": {
-			"name": "camel.component.aws2-translate.autowiredEnabled",
+		"camel.component.aws-secrets-manager.autowiredEnabled": {
+			"name": "camel.component.aws-secrets-manager.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.accessKey": {
-			"name": "camel.component.aws2-translate.accessKey",
+		"camel.component.aws-secrets-manager.accessKey": {
+			"name": "camel.component.aws-secrets-manager.accessKey",
 			"description": "Amazon AWS Access Key",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.secretKey": {
-			"name": "camel.component.aws2-translate.secretKey",
+		"camel.component.aws-secrets-manager.secretKey": {
+			"name": "camel.component.aws-secrets-manager.secretKey",
 			"description": "Amazon AWS Secret Key",
 			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..05f0b1a
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc
new file mode 100644
index 0000000..aba38cc
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc
@@ -0,0 +1,86 @@
+// kafka-connector options: START
+[[camel-aws-secrets-manager-kafka-connector-sink]]
+= camel-aws-secrets-manager-kafka-connector sink configuration
+
+Connector Description: Manage AWS Secrets Manager services using AWS SDK version 2.x.
+
+When using camel-aws-secrets-manager-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-aws-secrets-manager-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.awssecretsmanager.CamelAwssecretsmanagerSinkConnector
+----
+
+
+The camel-aws-secrets-manager sink connector supports 31 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.label* | Logical name | null | true | HIGH
+| *camel.sink.endpoint.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
+| *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
+| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
+| *camel.sink.endpoint.region* | The region in which Secrets Manager 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.secretsManagerClient* | To use a existing configured AWS Secrets Manager as client | null | false | MEDIUM
+| *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
+| *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
+| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.configuration* | Component configuration | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.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 p [...]
+| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret] | null | true | HIGH
+| *camel.component.aws-secrets-manager.override Endpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyPort* | To define a proxy port when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyProtocol* | To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
+| *camel.component.aws-secrets-manager.region* | The region in which Secrets Manager 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-secrets-manager.secretsManager Client* | To use a existing configured AWS Secrets Manager as client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.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-secrets-manager.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
+|===
+
+
+
+The camel-aws-secrets-manager sink connector has no converters out of the box.
+
+
+
+
+
+The camel-aws-secrets-manager sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-aws-secrets-manager sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties
new file mode 100644
index 0000000..2ea0a9d
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+name=CamelAws-secrets-managerSinkConnector
+connector.class=org.apache.camel.kafkaconnector.awssecretsmanager.CamelAwssecretsmanagerSinkConnector
+tasks.max=1
+
+# use the kafka converters that better suit your needs, these are just defaults:
+key.converter=org.apache.kafka.connect.storage.StringConverter
+value.converter=org.apache.kafka.connect.storage.StringConverter
+
+# comma separated topics to get messages from
+topics=
+
+# mandatory properties (for a complete properties list see the connector documentation):
+
+# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]
+camel.component.aws-secrets-manager.operation=
+# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]
+camel.sink.endpoint.operation=
+# Logical name
+camel.sink.path.label=
+
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnector.java b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnector.java
new file mode 100644
index 0000000..945e46f
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnector.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.awssecretsmanager;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAwssecretsmanagerSinkConnector extends CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelAwssecretsmanagerSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelAwssecretsmanagerSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java
new file mode 100644
index 0000000..77e9f22
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.awssecretsmanager;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAwssecretsmanagerSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_CONF = "camel.sink.path.label";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_DOC = "Logical name";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_CONF = "camel.sink.endpoint.binaryPayload";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_DOC = "Set if the secret is binary or not";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_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. Bewa [...]
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Secrets Manager client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Secrets Manager client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_DOC = "The region in which Secrets Manager 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()";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_CONF = "camel.sink.endpoint.secretsManagerClient";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_DOC = "To use a existing configured AWS Secrets Manager as client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_CONF = "camel.component.aws-secrets-manager.binaryPayload";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_DOC = "Set if the secret is binary or not";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-secrets-manager.configuration";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_DOC = "Component configuration";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-secrets-manager.lazyStartProducer";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_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. Bew [...]
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_CONF = "camel.component.aws-secrets-manager.operation";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret]";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws-secrets-manager.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws-secrets-manager.pojoRequest";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-secrets-manager.proxyHost";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Secrets Manager client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-secrets-manager.proxyPort";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Secrets Manager client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-secrets-manager.proxyProtocol";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS]";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_CONF = "camel.component.aws-secrets-manager.region";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_DOC = "The region in which Secrets Manager 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()";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_CONF = "camel.component.aws-secrets-manager.secretsManagerClient";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_DOC = "To use a existing configured AWS Secrets Manager as client";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws-secrets-manager.trustAllCertificates";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws-secrets-manager.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-secrets-manager.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_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_AWSSECRETSMANAGER_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-secrets-manager.accessKey";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-secrets-manager.secretKey";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_DEFAULT = null;
+
+    public CamelAwssecretsmanagerSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAwssecretsmanagerSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGER_PATH_LABEL_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_BINARY_PAYLOAD_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_POJO_REQUEST_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_HOST_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PORT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_PROXY_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRETS_MANAGER_CLIENT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_BINARY_PAYLOAD_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_POJO_REQUEST_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_HOST_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PORT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_PROXY_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRETS_MANAGER_CLIENT_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_SECRET_KEY_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkTask.java b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkTask.java
new file mode 100644
index 0000000..1123819
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.awssecretsmanager;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAwssecretsmanagerSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelAwssecretsmanagerSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-secrets-manager");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-google-functions-kafka-connector/pom.xml b/connectors/camel-google-functions-kafka-connector/pom.xml
new file mode 100644
index 0000000..e44eec1
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/pom.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-google-functions-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: google-functions</name>
+  <description>Camel Kafka Connector for google-functions</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-google-functions</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jackson</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-google-functions-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-google-functions-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..49270f6
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-google-functions-sink
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json b/connectors/camel-google-functions-kafka-connector/src/generated/resources/camel-google-functions-sink.json
similarity index 50%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
copy to connectors/camel-google-functions-kafka-connector/src/generated/resources/camel-google-functions-sink.json
index b80d60c..92708d7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
+++ b/connectors/camel-google-functions-kafka-connector/src/generated/resources/camel-google-functions-sink.json
@@ -1,29 +1,23 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.googlebigquerysql.CamelGooglebigquerysqlSinkConnector",
-		"artifactId": "camel-google-bigquery-sql-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.googlefunctions.CamelGooglefunctionsSinkConnector",
+		"artifactId": "camel-google-functions-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-google-bigquery-sql-sink",
+		"id": "camel-google-functions-sink",
 		"type": "sink",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Access Google Cloud BigQuery service using SQL queries."
+		"description": "Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library."
 	},
 	"properties": {
-		"camel.sink.path.query": {
-			"name": "camel.sink.path.query",
-			"description": "BigQuery standard SQL query",
+		"camel.sink.path.functionName": {
+			"name": "camel.sink.path.functionName",
+			"description": "The user-defined name of the function",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.path.projectId": {
-			"name": "camel.sink.path.projectId",
-			"description": "Google Cloud Project Id",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.connectionFactory": {
-			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "Service account key to authenticate an application as a service account",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -34,31 +28,60 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.connectionFactory": {
-			"name": "camel.component.google-bigquery-sql.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
+		"camel.sink.endpoint.location": {
+			"name": "camel.sink.endpoint.location",
+			"description": "The Google Cloud Location (Region) where the Function is located",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.lazyStartProducer": {
-			"name": "camel.component.google-bigquery-sql.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 [...]
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to perform on the producer. One of: [listFunctions] [getFunction] [callFunction] [generateDownloadUrl] [generateUploadUrl] [createFunction] [updateFunction] [deleteFunction]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"listFunctions",
+				"getFunction",
+				"callFunction",
+				"generateDownloadUrl",
+				"generateUploadUrl",
+				"createFunction",
+				"updateFunction",
+				"deleteFunction"
+			]
+		},
+		"camel.sink.endpoint.pojoRequest": {
+			"name": "camel.sink.endpoint.pojoRequest",
+			"description": "Specifies if the request is a pojo request",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.projectId": {
-			"name": "camel.component.google-bigquery-sql.projectId",
-			"description": "Google Cloud Project Id",
+		"camel.sink.endpoint.project": {
+			"name": "camel.sink.endpoint.project",
+			"description": "The Google Cloud Project name where the Function is located",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.client": {
+			"name": "camel.sink.endpoint.client",
+			"description": "The client to use during service invocation.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-functions.lazyStartProducer": {
+			"name": "camel.component.google-functions.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.autowiredEnabled": {
-			"name": "camel.component.google-bigquery-sql.autowiredEnabled",
+		"camel.component.google-functions.autowiredEnabled": {
+			"name": "camel.component.google-functions.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on 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-google-functions-kafka-connector/src/main/assembly/package.xml b/connectors/camel-google-functions-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..05f0b1a
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/docs/camel-google-functions-kafka-sink-connector.adoc b/connectors/camel-google-functions-kafka-connector/src/main/docs/camel-google-functions-kafka-sink-connector.adoc
new file mode 100644
index 0000000..6a46ba4
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/docs/camel-google-functions-kafka-sink-connector.adoc
@@ -0,0 +1,65 @@
+// kafka-connector options: START
+[[camel-google-functions-kafka-connector-sink]]
+= camel-google-functions-kafka-connector sink configuration
+
+Connector Description: Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library.
+
+When using camel-google-functions-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-functions-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlefunctions.CamelGooglefunctionsSinkConnector
+----
+
+
+The camel-google-functions sink connector supports 10 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.functionName* | The user-defined name of the function | null | true | HIGH
+| *camel.sink.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | 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.location* | The Google Cloud Location (Region) where the Function is located | null | false | MEDIUM
+| *camel.sink.endpoint.operation* | The operation to perform on the producer. One of: [listFunctions] [getFunction] [callFunction] [generateDownloadUrl] [generateUploadUrl] [createFunction] [updateFunction] [deleteFunction] | null | false | MEDIUM
+| *camel.sink.endpoint.pojoRequest* | Specifies if the request is a pojo request | false | false | MEDIUM
+| *camel.sink.endpoint.project* | The Google Cloud Project name where the Function is located | null | false | MEDIUM
+| *camel.sink.endpoint.client* | The client to use during service invocation. | null | false | MEDIUM
+| *camel.component.google-functions.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.google-functions.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
+|===
+
+
+
+The camel-google-functions sink connector has no converters out of the box.
+
+
+
+
+
+The camel-google-functions sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-functions sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/docs/examples/CamelGooglefunctionsSinkConnector.properties b/connectors/camel-google-functions-kafka-connector/src/main/docs/examples/CamelGooglefunctionsSinkConnector.properties
new file mode 100644
index 0000000..96231c0
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/docs/examples/CamelGooglefunctionsSinkConnector.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+name=CamelGoogle-functionsSinkConnector
+connector.class=org.apache.camel.kafkaconnector.googlefunctions.CamelGooglefunctionsSinkConnector
+tasks.max=1
+
+# use the kafka converters that better suit your needs, these are just defaults:
+key.converter=org.apache.kafka.connect.storage.StringConverter
+value.converter=org.apache.kafka.connect.storage.StringConverter
+
+# comma separated topics to get messages from
+topics=
+
+# mandatory properties (for a complete properties list see the connector documentation):
+
+# The user-defined name of the function
+camel.sink.path.functionName=
+
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnector.java b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnector.java
new file mode 100644
index 0000000..7b160fc
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnector.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlefunctions;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglefunctionsSinkConnector extends CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelGooglefunctionsSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelGooglefunctionsSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnectorConfig.java b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnectorConfig.java
new file mode 100644
index 0000000..eac38cb
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkConnectorConfig.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlefunctions;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglefunctionsSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_CONF = "camel.sink.path.functionName";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_DOC = "The user-defined name of the function";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.sink.endpoint.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "Service account key to authenticate an application as a service account";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_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_GOOGLEFUNCTIONS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_CONF = "camel.sink.endpoint.location";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_DOC = "The Google Cloud Location (Region) where the Function is located";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_DOC = "The operation to perform on the producer. One of: [listFunctions] [getFunction] [callFunction] [generateDownloadUrl] [generateUploadUrl] [createFunction] [updateFunction] [deleteFunction]";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_DOC = "Specifies if the request is a pojo request";
+    public static final Boolean CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_CONF = "camel.sink.endpoint.project";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_DOC = "The Google Cloud Project name where the Function is located";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_CONF = "camel.sink.endpoint.client";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_DOC = "The client to use during service invocation.";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.google-functions.lazyStartProducer";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_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_GOOGLEFUNCTIONS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.google-functions.autowiredEnabled";
+    public static final String CAMEL_SINK_GOOGLEFUNCTIONS_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_GOOGLEFUNCTIONS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+
+    public CamelGooglefunctionsSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelGooglefunctionsSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLEFUNCTIONS_PATH_FUNCTION_NAME_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_LOCATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_POJO_REQUEST_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_PROJECT_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_ENDPOINT_CLIENT_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEFUNCTIONS_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkTask.java b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkTask.java
new file mode 100644
index 0000000..6268b85
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctions/CamelGooglefunctionsSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlefunctions;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglefunctionsSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelGooglefunctionsSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "google-functions");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-google-functions-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-google-storage-kafka-connector/pom.xml b/connectors/camel-google-storage-kafka-connector/pom.xml
new file mode 100644
index 0000000..4472e10
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/pom.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-google-storage-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: google-storage</name>
+  <description>Camel Kafka Connector for google-storage</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-google-storage</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jackson</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..e0f34c1
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-google-storage-sink
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-source.properties
new file mode 100644
index 0000000..dda489b
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/descriptors/connector-source.properties
@@ -0,0 +1 @@
+camel-google-storage-source
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
new file mode 100644
index 0000000..2b14c85
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
@@ -0,0 +1,154 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSinkConnector",
+		"artifactId": "camel-google-storage-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-google-storage-sink",
+		"type": "sink",
+		"version": "0.9.0-SNAPSHOT",
+		"description": "Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library."
+	},
+	"properties": {
+		"camel.sink.path.bucketName": {
+			"name": "camel.sink.path.bucketName",
+			"description": "Bucket name or ARN",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.autoCreateBucket": {
+			"name": "camel.sink.endpoint.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageClass": {
+			"name": "camel.sink.endpoint.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageClient": {
+			"name": "camel.sink.endpoint.storageClient",
+			"description": "The storage client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.storageLocation": {
+			"name": "camel.sink.endpoint.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.objectName": {
+			"name": "camel.sink.endpoint.objectName",
+			"description": "The Object name inside the bucket",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"copyObject",
+				"listObjects",
+				"deleteObject",
+				"deleteBucket",
+				"listBuckets",
+				"getObject",
+				"createDownloadLink"
+			]
+		},
+		"camel.component.google-storage.autoCreateBucket": {
+			"name": "camel.component.google-storage.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.configuration": {
+			"name": "camel.component.google-storage.configuration",
+			"description": "The component configuration",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.serviceAccountKey": {
+			"name": "camel.component.google-storage.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageClass": {
+			"name": "camel.component.google-storage.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageClient": {
+			"name": "camel.component.google-storage.storageClient",
+			"description": "The storage client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.storageLocation": {
+			"name": "camel.component.google-storage.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.lazyStartProducer": {
+			"name": "camel.component.google-storage.lazyStartProducer",
+			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.objectName": {
+			"name": "camel.component.google-storage.objectName",
+			"description": "The Object name inside the bucket",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.google-storage.operation": {
+			"name": "camel.component.google-storage.operation",
+			"description": "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"copyObject",
+				"listObjects",
+				"deleteObject",
+				"deleteBucket",
+				"listBuckets",
+				"getObject",
+				"createDownloadLink"
+			]
+		},
+		"camel.component.google-storage.autowiredEnabled": {
+			"name": "camel.component.google-storage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
similarity index 58%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
copy to connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
index 055f135..c7e7297 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
@@ -1,98 +1,97 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstreamSourceConnector",
-		"artifactId": "camel-aws2-ddbstream-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSourceConnector",
+		"artifactId": "camel-google-storage-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws2-ddbstream-source",
+		"id": "camel-google-storage-source",
 		"type": "source",
 		"version": "0.9.0-SNAPSHOT",
-		"description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x."
+		"description": "Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library."
 	},
 	"properties": {
-		"camel.source.path.tableName": {
-			"name": "camel.source.path.tableName",
-			"description": "Name of the dynamodb table",
+		"camel.source.path.bucketName": {
+			"name": "camel.source.path.bucketName",
+			"description": "Bucket name or ARN",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
-			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
-			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
+		"camel.source.endpoint.autoCreateBucket": {
+			"name": "camel.source.endpoint.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.bridgeErrorHandler": {
-			"name": "camel.source.endpoint.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.iteratorType": {
-			"name": "camel.source.endpoint.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
+		"camel.source.endpoint.storageClass": {
+			"name": "camel.source.endpoint.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"null"
-			]
+			"required": "false"
 		},
-		"camel.source.endpoint.maxResultsPerRequest": {
-			"name": "camel.source.endpoint.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
+		"camel.source.endpoint.storageClient": {
+			"name": "camel.source.endpoint.storageClient",
+			"description": "The storage client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyHost": {
-			"name": "camel.source.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
+		"camel.source.endpoint.storageLocation": {
+			"name": "camel.source.endpoint.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.bridgeErrorHandler": {
+			"name": "camel.source.endpoint.bridgeErrorHandler",
+			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyPort": {
-			"name": "camel.source.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
+		"camel.source.endpoint.deleteAfterRead": {
+			"name": "camel.source.endpoint.deleteAfterRead",
+			"description": "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.proxyProtocol": {
-			"name": "camel.source.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
+		"camel.source.endpoint.destinationBucket": {
+			"name": "camel.source.endpoint.destinationBucket",
+			"description": "Define the destination bucket where an object must be moved when moveAfterRead is set to true.",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
+			"required": "false"
 		},
-		"camel.source.endpoint.region": {
-			"name": "camel.source.endpoint.region",
-			"description": "The region in which DDBStreams client needs to work",
+		"camel.source.endpoint.includeBody": {
+			"name": "camel.source.endpoint.includeBody",
+			"description": "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
-			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
-			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
-			"defaultValue": "false",
+		"camel.source.endpoint.includeFolders": {
+			"name": "camel.source.endpoint.includeFolders",
+			"description": "If it is true, the folders\/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.sequenceNumberProvider": {
-			"name": "camel.source.endpoint.sequenceNumberProvider",
-			"description": "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.",
+		"camel.source.endpoint.moveAfterRead": {
+			"name": "camel.source.endpoint.moveAfterRead",
+			"description": "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.trustAllCertificates": {
-			"name": "camel.source.endpoint.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
+		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
+			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
+			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -230,117 +229,92 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.accessKey": {
-			"name": "camel.source.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
+		"camel.component.google-storage.autoCreateBucket": {
+			"name": "camel.component.google-storage.autoCreateBucket",
+			"description": "Setting the autocreation of the bucket bucketName.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.secretKey": {
-			"name": "camel.source.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
+		"camel.component.google-storage.configuration": {
+			"name": "camel.component.google-storage.configuration",
+			"description": "The component configuration",
 			"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",
+		"camel.component.google-storage.serviceAccountKey": {
+			"name": "camel.component.google-storage.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.bridgeErrorHandler": {
-			"name": "camel.component.aws2-ddbstream.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
+		"camel.component.google-storage.storageClass": {
+			"name": "camel.component.google-storage.storageClass",
+			"description": "The Cloud Storage class to use when creating the new buckets",
+			"defaultValue": "\"STANDARD\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.configuration": {
-			"name": "camel.component.aws2-ddbstream.configuration",
-			"description": "The component configuration",
+		"camel.component.google-storage.storageClient": {
+			"name": "camel.component.google-storage.storageClient",
+			"description": "The storage client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.iteratorType": {
-			"name": "camel.component.aws2-ddbstream.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"null"
-			]
-		},
-		"camel.component.aws2-ddbstream.maxResultsPerRequest": {
-			"name": "camel.component.aws2-ddbstream.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
+		"camel.component.google-storage.storageLocation": {
+			"name": "camel.component.google-storage.storageLocation",
+			"description": "The Cloud Storage location to use when creating the new buckets",
+			"defaultValue": "\"US-EAST1\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyHost": {
-			"name": "camel.component.aws2-ddbstream.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
+		"camel.component.google-storage.bridgeErrorHandler": {
+			"name": "camel.component.google-storage.bridgeErrorHandler",
+			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyPort": {
-			"name": "camel.component.aws2-ddbstream.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
+		"camel.component.google-storage.deleteAfterRead": {
+			"name": "camel.component.google-storage.deleteAfterRead",
+			"description": "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.proxyProtocol": {
-			"name": "camel.component.aws2-ddbstream.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
+		"camel.component.google-storage.destinationBucket": {
+			"name": "camel.component.google-storage.destinationBucket",
+			"description": "Define the destination bucket where an object must be moved when moveAfterRead is set to true.",
 			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
+			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.region": {
-			"name": "camel.component.aws2-ddbstream.region",
-			"description": "The region in which DDBStreams client needs to work",
+		"camel.component.google-storage.includeBody": {
+			"name": "camel.component.google-storage.includeBody",
+			"description": "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.sequenceNumberProvider": {
-			"name": "camel.component.aws2-ddbstream.sequenceNumberProvider",
-			"description": "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.",
+		"camel.component.google-storage.includeFolders": {
+			"name": "camel.component.google-storage.includeFolders",
+			"description": "If it is true, the folders\/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those",
+			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.trustAllCertificates": {
-			"name": "camel.component.aws2-ddbstream.trustAllCertificates",
-			"description": "If we want to trust all certificates in case of overriding the endpoint",
+		"camel.component.google-storage.moveAfterRead": {
+			"name": "camel.component.google-storage.moveAfterRead",
+			"description": "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autowiredEnabled": {
-			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+		"camel.component.google-storage.autowiredEnabled": {
+			"name": "camel.component.google-storage.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. 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": {
-			"name": "camel.component.aws2-ddbstream.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws2-ddbstream.secretKey": {
-			"name": "camel.component.aws2-ddbstream.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/assembly/package.xml b/connectors/camel-google-storage-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..05f0b1a
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
new file mode 100644
index 0000000..585f20b
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
@@ -0,0 +1,74 @@
+// kafka-connector options: START
+[[camel-google-storage-kafka-connector-sink]]
+= camel-google-storage-kafka-connector sink configuration
+
+Connector Description: Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library.
+
+When using camel-google-storage-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-storage-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSinkConnector
+----
+
+
+The camel-google-storage sink connector supports 19 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.bucketName* | Bucket name or ARN | null | true | HIGH
+| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.sink.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.sink.endpoint.storageClient* | The storage client | null | false | MEDIUM
+| *camel.sink.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | 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.objectName* | The Object name inside the bucket | null | false | MEDIUM
+| *camel.sink.endpoint.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
+| *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
+| *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
+| *camel.component.google-storage.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 process [...]
+| *camel.component.google-storage.objectName* | The Object name inside the bucket | null | false | MEDIUM
+| *camel.component.google-storage.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
+| *camel.component.google-storage.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
+|===
+
+
+
+The camel-google-storage sink connector has no converters out of the box.
+
+
+
+
+
+The camel-google-storage sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-storage sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc
new file mode 100644
index 0000000..df9b7fe
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc
@@ -0,0 +1,98 @@
+// kafka-connector options: START
+[[camel-google-storage-kafka-connector-source]]
+= camel-google-storage-kafka-connector source configuration
+
+Connector description: Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library.
+
+When using camel-google-storage-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-storage-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Source connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSourceConnector
+----
+
+
+The camel-google-storage source connector supports 43 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.source.path.bucketName* | Bucket name or ARN | null | true | HIGH
+| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.source.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.source.endpoint.storageClient* | The storage client | null | false | MEDIUM
+| *camel.source.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | 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.deleteAfterRead* | Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. | true | false | MEDIUM
+| *camel.source.endpoint.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | false | MEDIUM
+| *camel.source.endpoint.includeBody* | If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata. | true | false | MEDIUM
+| *camel.source.endpoint.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | false | MEDIUM
+| *camel.source.endpoint.moveAfterRead* | Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved. | false | false | MEDIUM
+| *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | 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.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.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
+| *camel.source.endpoint.backoffMultiplier* | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | null | false | MEDIUM
+| *camel.source.endpoint.delay* | Milliseconds before the next poll. | 500L | false | MEDIUM
+| *camel.source.endpoint.greedy* | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | false | MEDIUM
+| *camel.source.endpoint.initialDelay* | Milliseconds before the first poll starts. | 1000L | false | MEDIUM
+| *camel.source.endpoint.repeatCount* | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0L | false | MEDIUM
+| *camel.source.endpoint.runLoggingLevel* | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "TRACE" | false | MEDIUM
+| *camel.source.endpoint.scheduledExecutorService* | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | null | false | MEDIUM
+| *camel.source.endpoint.scheduler* | To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler | "none" | false | MEDIUM
+| *camel.source.endpoint.schedulerProperties* | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | null | false | MEDIUM
+| *camel.source.endpoint.startScheduler* | Whether the scheduler should be auto started. | true | false | MEDIUM
+| *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.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
+| *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
+| *camel.component.google-storage.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.google-storage.deleteAfterRead* | Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. | true | false | MEDIUM
+| *camel.component.google-storage.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | false | MEDIUM
+| *camel.component.google-storage.includeBody* | If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata. | true | false | MEDIUM
+| *camel.component.google-storage.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | false | MEDIUM
+| *camel.component.google-storage.moveAfterRead* | Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved. | false | false | MEDIUM
+| *camel.component.google-storage.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
+|===
+
+
+
+The camel-google-storage source connector has no converters out of the box.
+
+
+
+
+
+The camel-google-storage source connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-storage source connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSinkConnector.properties b/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSinkConnector.properties
new file mode 100644
index 0000000..8b83f91
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSinkConnector.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+name=CamelGoogle-storageSinkConnector
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSinkConnector
+tasks.max=1
+
+# use the kafka converters that better suit your needs, these are just defaults:
+key.converter=org.apache.kafka.connect.storage.StringConverter
+value.converter=org.apache.kafka.connect.storage.StringConverter
+
+# comma separated topics to get messages from
+topics=
+
+# mandatory properties (for a complete properties list see the connector documentation):
+
+# Bucket name or ARN
+camel.sink.path.bucketName=
+
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSourceConnector.properties b/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSourceConnector.properties
new file mode 100644
index 0000000..e81ca59
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/examples/CamelGooglestorageSourceConnector.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+name=CamelGoogle-storageSourceConnector
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSourceConnector
+tasks.max=1
+
+# use the kafka converters that better suit your needs, these are just defaults:
+key.converter=org.apache.kafka.connect.storage.StringConverter
+value.converter=org.apache.kafka.connect.storage.StringConverter
+
+# comma separated topics to send messages into
+topics=
+
+# mandatory properties (for a complete properties list see the connector documentation):
+
+# Bucket name or ARN
+camel.source.path.bucketName=
+
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnector.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnector.java
new file mode 100644
index 0000000..66f1ef6
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnector.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSinkConnector extends CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelGooglestorageSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelGooglestorageSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
new file mode 100644
index 0000000..107ba08
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_CONF = "camel.sink.path.bucketName";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_DOC = "Bucket name or ARN";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.sink.endpoint.autoCreateBucket";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
+    public static final Boolean CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.sink.endpoint.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF = "camel.sink.endpoint.storageClass";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DEFAULT = "STANDARD";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_CONF = "camel.sink.endpoint.storageClient";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DOC = "The storage client";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_CONF = "camel.sink.endpoint.storageLocation";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DOC = "The Cloud Storage location to use when creating the new buckets";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DEFAULT = "US-EAST1";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_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 t [...]
+    public static final Boolean CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_CONF = "camel.sink.endpoint.objectName";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_DOC = "The Object name inside the bucket";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_DOC = "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.google-storage.autoCreateBucket";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
+    public static final Boolean CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_CONF = "camel.component.google-storage.configuration";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC = "The component configuration";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-storage.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF = "camel.component.google-storage.storageClass";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DEFAULT = "STANDARD";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_CONF = "camel.component.google-storage.storageClient";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DOC = "The storage client";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_CONF = "camel.component.google-storage.storageLocation";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DOC = "The Cloud Storage location to use when creating the new buckets";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DEFAULT = "US-EAST1";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.google-storage.lazyStartProducer";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_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  [...]
+    public static final Boolean CAMEL_SINK_GOOGLESTORAGE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_CONF = "camel.component.google-storage.objectName";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_DOC = "The Object name inside the bucket";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_CONF = "camel.component.google-storage.operation";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_DOC = "Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink]";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.google-storage.autowiredEnabled";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_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_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+
+    public CamelGooglestorageSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelGooglestorageSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GOOGLESTORAGE_PATH_BUCKET_NAME_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OBJECT_NAME_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OBJECT_NAME_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkTask.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkTask.java
new file mode 100644
index 0000000..44b004b
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelGooglestorageSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "google-storage");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnector.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnector.java
new file mode 100644
index 0000000..2788c52
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnector.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSourceConnector extends CamelSourceConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelGooglestorageSourceConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelGooglestorageSourceTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
new file mode 100644
index 0000000..16d6d8d
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSourceConnectorConfig
+        extends
+            CamelSourceConnectorConfig {
+
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_CONF = "camel.source.path.bucketName";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_DOC = "Bucket name or ARN";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.source.endpoint.autoCreateBucket";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.source.endpoint.serviceAccountKey";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF = "camel.source.endpoint.storageClass";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DEFAULT = "STANDARD";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_CONF = "camel.source.endpoint.storageClient";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DOC = "The storage client";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_CONF = "camel.source.endpoint.storageLocation";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DOC = "The Cloud Storage location to use when creating the new buckets";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DEFAULT = "US-EAST1";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level a [...]
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_CONF = "camel.source.endpoint.deleteAfterRead";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_DOC = "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_CONF = "camel.source.endpoint.destinationBucket";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_DOC = "Define the destination bucket where an object must be moved when moveAfterRead is set to true.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_CONF = "camel.source.endpoint.includeBody";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_DOC = "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_CONF = "camel.source.endpoint.includeFolders";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_DOC = "If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_CONF = "camel.source.endpoint.moveAfterRead";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_DOC = "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF = "camel.source.endpoint.sendEmptyMessageWhenIdle";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_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_GOOGLESTORAGE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_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_GOOGLESTORAGE_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF = "camel.source.endpoint.backoffErrorThreshold";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC = "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.";
+    public static final Integer CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF = "camel.source.endpoint.backoffIdleThreshold";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC = "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.";
+    public static final Integer CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_CONF = "camel.source.endpoint.backoffMultiplier";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_DOC = "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.";
+    public static final Integer CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_CONF = "camel.source.endpoint.delay";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_DOC = "Milliseconds before the next poll.";
+    public static final Long CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_DEFAULT = 500L;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_CONF = "camel.source.endpoint.greedy";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_DOC = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_CONF = "camel.source.endpoint.initialDelay";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_DOC = "Milliseconds before the first poll starts.";
+    public static final Long CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_DEFAULT = 1000L;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_CONF = "camel.source.endpoint.repeatCount";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_DOC = "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.";
+    public static final Long CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_DEFAULT = 0L;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_CONF = "camel.source.endpoint.runLoggingLevel";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_DOC = "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_DEFAULT = "TRACE";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_CONF = "camel.source.endpoint.scheduledExecutorService";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DOC = "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_CONF = "camel.source.endpoint.scheduler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_DOC = "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_DEFAULT = "none";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_CONF = "camel.source.endpoint.schedulerProperties";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_DOC = "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_CONF = "camel.source.endpoint.startScheduler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_DOC = "Whether the scheduler should be auto started.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_CONF = "camel.source.endpoint.timeUnit";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_DOC = "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_DEFAULT = "MILLISECONDS";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_CONF = "camel.source.endpoint.useFixedDelay";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_DOC = "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.google-storage.autoCreateBucket";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_CONF = "camel.component.google-storage.configuration";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC = "The component configuration";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-storage.serviceAccountKey";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF = "camel.component.google-storage.storageClass";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DEFAULT = "STANDARD";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_CONF = "camel.component.google-storage.storageClient";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DOC = "The storage client";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_CONF = "camel.component.google-storage.storageLocation";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DOC = "The Cloud Storage location to use when creating the new buckets";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DEFAULT = "US-EAST1";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.google-storage.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_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  [...]
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_CONF = "camel.component.google-storage.deleteAfterRead";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_DOC = "Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_CONF = "camel.component.google-storage.destinationBucket";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_DOC = "Define the destination bucket where an object must be moved when moveAfterRead is set to true.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_CONF = "camel.component.google-storage.includeBody";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_DOC = "If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_CONF = "camel.component.google-storage.includeFolders";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_DOC = "If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_DEFAULT = true;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_CONF = "camel.component.google-storage.moveAfterRead";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_DOC = "Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved.";
+    public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.google-storage.autowiredEnabled";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_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_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+
+    public CamelGooglestorageSourceConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelGooglestorageSourceConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GOOGLESTORAGE_PATH_BUCKET_NAME_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_LOCATION_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELETE_AFTER_READ_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DESTINATION_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_BODY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INCLUDE_FOLDERS_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_MOVE_AFTER_READ_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCEPTION_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_EXCHANGE_PATTERN_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_POLL_STRATEGY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_BACKOFF_MULTIPLIER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_DELAY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_GREEDY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_INITIAL_DELAY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_REPEAT_COUNT_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_RUN_LOGGING_LEVEL_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SCHEDULER_PROPERTIES_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_START_SCHEDULER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_TIME_UNIT_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_USE_FIXED_DELAY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_LOCATION_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DELETE_AFTER_READ_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_DESTINATION_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_BODY_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_INCLUDE_FOLDERS_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_MOVE_AFTER_READ_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceTask.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceTask.java
new file mode 100644
index 0000000..8194edc
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.googlestorage;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSourceTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelGooglestorageSourceTask extends CamelSourceTask {
+
+    @Override
+    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+            Map<String, String> props) {
+        return new CamelGooglestorageSourceConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "google-storage");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-google-storage-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc
new file mode 100644
index 0000000..aba38cc
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc
@@ -0,0 +1,86 @@
+// kafka-connector options: START
+[[camel-aws-secrets-manager-kafka-connector-sink]]
+= camel-aws-secrets-manager-kafka-connector sink configuration
+
+Connector Description: Manage AWS Secrets Manager services using AWS SDK version 2.x.
+
+When using camel-aws-secrets-manager-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-aws-secrets-manager-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.awssecretsmanager.CamelAwssecretsmanagerSinkConnector
+----
+
+
+The camel-aws-secrets-manager sink connector supports 31 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.label* | Logical name | null | true | HIGH
+| *camel.sink.endpoint.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
+| *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
+| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
+| *camel.sink.endpoint.region* | The region in which Secrets Manager 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.secretsManagerClient* | To use a existing configured AWS Secrets Manager as client | null | false | MEDIUM
+| *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
+| *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
+| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.configuration* | Component configuration | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.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 p [...]
+| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] [rotateSecret] [updateSecret] | null | true | HIGH
+| *camel.component.aws-secrets-manager.override Endpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyPort* | To define a proxy port when instantiating the Secrets Manager client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.proxyProtocol* | To define a proxy protocol when instantiating the Secrets Manager client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
+| *camel.component.aws-secrets-manager.region* | The region in which Secrets Manager 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-secrets-manager.secretsManager Client* | To use a existing configured AWS Secrets Manager as client | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws-secrets-manager.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.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-secrets-manager.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
+| *camel.component.aws-secrets-manager.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
+|===
+
+
+
+The camel-aws-secrets-manager sink connector has no converters out of the box.
+
+
+
+
+
+The camel-aws-secrets-manager sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-aws-secrets-manager sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-functions-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-functions-kafka-sink-connector.adoc
new file mode 100644
index 0000000..6a46ba4
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-google-functions-kafka-sink-connector.adoc
@@ -0,0 +1,65 @@
+// kafka-connector options: START
+[[camel-google-functions-kafka-connector-sink]]
+= camel-google-functions-kafka-connector sink configuration
+
+Connector Description: Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library.
+
+When using camel-google-functions-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-functions-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlefunctions.CamelGooglefunctionsSinkConnector
+----
+
+
+The camel-google-functions sink connector supports 10 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.functionName* | The user-defined name of the function | null | true | HIGH
+| *camel.sink.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | 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.location* | The Google Cloud Location (Region) where the Function is located | null | false | MEDIUM
+| *camel.sink.endpoint.operation* | The operation to perform on the producer. One of: [listFunctions] [getFunction] [callFunction] [generateDownloadUrl] [generateUploadUrl] [createFunction] [updateFunction] [deleteFunction] | null | false | MEDIUM
+| *camel.sink.endpoint.pojoRequest* | Specifies if the request is a pojo request | false | false | MEDIUM
+| *camel.sink.endpoint.project* | The Google Cloud Project name where the Function is located | null | false | MEDIUM
+| *camel.sink.endpoint.client* | The client to use during service invocation. | null | false | MEDIUM
+| *camel.component.google-functions.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.google-functions.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
+|===
+
+
+
+The camel-google-functions sink connector has no converters out of the box.
+
+
+
+
+
+The camel-google-functions sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-functions sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
new file mode 100644
index 0000000..585f20b
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
@@ -0,0 +1,74 @@
+// kafka-connector options: START
+[[camel-google-storage-kafka-connector-sink]]
+= camel-google-storage-kafka-connector sink configuration
+
+Connector Description: Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library.
+
+When using camel-google-storage-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-storage-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSinkConnector
+----
+
+
+The camel-google-storage sink connector supports 19 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.bucketName* | Bucket name or ARN | null | true | HIGH
+| *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.sink.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.sink.endpoint.storageClient* | The storage client | null | false | MEDIUM
+| *camel.sink.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | 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.objectName* | The Object name inside the bucket | null | false | MEDIUM
+| *camel.sink.endpoint.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
+| *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
+| *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
+| *camel.component.google-storage.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 process [...]
+| *camel.component.google-storage.objectName* | The Object name inside the bucket | null | false | MEDIUM
+| *camel.component.google-storage.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
+| *camel.component.google-storage.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
+|===
+
+
+
+The camel-google-storage sink connector has no converters out of the box.
+
+
+
+
+
+The camel-google-storage sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-storage sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc
new file mode 100644
index 0000000..df9b7fe
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc
@@ -0,0 +1,98 @@
+// kafka-connector options: START
+[[camel-google-storage-kafka-connector-source]]
+= camel-google-storage-kafka-connector source configuration
+
+Connector description: Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library.
+
+When using camel-google-storage-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-google-storage-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Source connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.googlestorage.CamelGooglestorageSourceConnector
+----
+
+
+The camel-google-storage source connector supports 43 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.source.path.bucketName* | Bucket name or ARN | null | true | HIGH
+| *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.source.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.source.endpoint.storageClient* | The storage client | null | false | MEDIUM
+| *camel.source.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | 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.deleteAfterRead* | Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. | true | false | MEDIUM
+| *camel.source.endpoint.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | false | MEDIUM
+| *camel.source.endpoint.includeBody* | If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata. | true | false | MEDIUM
+| *camel.source.endpoint.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | false | MEDIUM
+| *camel.source.endpoint.moveAfterRead* | Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved. | false | false | MEDIUM
+| *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | 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.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.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
+| *camel.source.endpoint.backoffMultiplier* | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | null | false | MEDIUM
+| *camel.source.endpoint.delay* | Milliseconds before the next poll. | 500L | false | MEDIUM
+| *camel.source.endpoint.greedy* | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | false | MEDIUM
+| *camel.source.endpoint.initialDelay* | Milliseconds before the first poll starts. | 1000L | false | MEDIUM
+| *camel.source.endpoint.repeatCount* | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0L | false | MEDIUM
+| *camel.source.endpoint.runLoggingLevel* | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "TRACE" | false | MEDIUM
+| *camel.source.endpoint.scheduledExecutorService* | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | null | false | MEDIUM
+| *camel.source.endpoint.scheduler* | To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler | "none" | false | MEDIUM
+| *camel.source.endpoint.schedulerProperties* | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | null | false | MEDIUM
+| *camel.source.endpoint.startScheduler* | Whether the scheduler should be auto started. | true | false | MEDIUM
+| *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.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
+| *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
+| *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
+| *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
+| *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
+| *camel.component.google-storage.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.google-storage.deleteAfterRead* | Delete objects from the bucket after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. | true | false | MEDIUM
+| *camel.component.google-storage.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | false | MEDIUM
+| *camel.component.google-storage.includeBody* | If it is true, the Object exchange will be consumed and put into the body. If false the Object stream will be put raw into the body and the headers will be set with the object metadata. | true | false | MEDIUM
+| *camel.component.google-storage.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | false | MEDIUM
+| *camel.component.google-storage.moveAfterRead* | Move objects from the origin bucket to a different bucket after they have been retrieved. To accomplish the operation the destinationBucket option must be set. The copy bucket operation is only performed if the Exchange is committed. If a rollback occurs, the object is not moved. | false | false | MEDIUM
+| *camel.component.google-storage.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
+|===
+
+
+
+The camel-google-storage source connector has no converters out of the box.
+
+
+
+
+
+The camel-google-storage source connector has no transforms out of the box.
+
+
+
+
+
+The camel-google-storage source connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END

[camel-kafka-connector] 01/09: Adjusted catalog tests for camel 3.9.0

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

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

commit c824ad74be6eaf5291d31e8f96d11415682d788b
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Wed Mar 10 16:15:01 2021 +0100

    Adjusted catalog tests for camel 3.9.0
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 15a34ea..114e311 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -77,7 +77,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());
-        assertEquals("true", model.getOptions().get(2).getDefaultValue());
+        assertEquals("false", model.getOptions().get(2).getDefaultValue());
         assertNull(model.getOptions().get(1).getDefaultValue());
         assertNull(model.getConverters());
         assertNull(model.getTransforms());

[camel-kafka-connector] 09/09: Align to 3.9.0

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

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

commit d5a4d5f8bcf0b59d6b6db59628a95283bfbc2133
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 08:05:06 2021 +0200

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

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 15a34ea..114e311 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -77,7 +77,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());
-        assertEquals("true", model.getOptions().get(2).getDefaultValue());
+        assertEquals("false", model.getOptions().get(2).getDefaultValue());
         assertNull(model.getOptions().get(1).getDefaultValue());
         assertNull(model.getConverters());
         assertNull(model.getTransforms());

[camel-kafka-connector] 02/09: Adjusted the code to CAMEL-16299

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

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

commit 267ab143527b1969a8acc4b6204fa27b355827f5
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Mar 10 15:18:24 2021 +0100

    Adjusted the code to CAMEL-16299
---
 .../blob/sink/CamelSinkAzureStorageBlobITCase.java |   2 +-
 .../sink/CamelSinkAzureStorageQueueITCase.java     |   2 +-
 .../source/CamelSourceAzureStorageQueueITCase.java |   2 +-
 .../kafkaconnector/common/AbstractKafkaTest.java   |  15 ++-
 .../common/services/kafka/KafkaServiceFactory.java |  45 ---------
 .../common/services/kafka/StrimziService.java      | 103 ---------------------
 .../kafkaconnector/sjms2/common/SJMS2Common.java   |   9 ++
 .../sjms2/sink/CamelSinkIdempotentJMSITCase.java   |   9 +-
 .../sjms2/sink/CamelSinkJMSITCase.java             |   9 +-
 .../sjms2/source/CamelSourceJMSITCase.java         |   9 +-
 .../source/CamelSourceJMSWithAggregation.java      |   9 +-
 11 files changed, 41 insertions(+), 173 deletions(-)

diff --git a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
index 727d3fb..e7cb8e5 100644
--- a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
+++ b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
@@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSinkAzureStorageBlobITCase extends CamelSinkTestSupport {
     @RegisterExtension
-    public static AzureService service = AzureStorageBlobServiceFactory.createAzureService();
+    public static AzureService service = AzureStorageBlobServiceFactory.createService();
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAzureStorageBlobITCase.class);
 
     private BlobServiceClient client;
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
index ef12c18..78a297c 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSinkAzureStorageQueueITCase extends CamelSinkTestSupport {
     @RegisterExtension
-    public static AzureService service = AzureStorageQueueServiceFactory.createAzureService();
+    public static AzureService service = AzureStorageQueueServiceFactory.createService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAzureStorageQueueITCase.class);
 
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/source/CamelSourceAzureStorageQueueITCase.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/source/CamelSourceAzureStorageQueueITCase.java
index 26faa6e..da640da 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/source/CamelSourceAzureStorageQueueITCase.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/source/CamelSourceAzureStorageQueueITCase.java
@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSourceAzureStorageQueueITCase extends CamelSourceTestSupport {
     @RegisterExtension
-    public static AzureService service = AzureStorageQueueServiceFactory.createAzureService();
+    public static AzureService service = AzureStorageQueueServiceFactory.createService();
 
     private QueueServiceClient client;
     private QueueClient queueClient;
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
index fb24ca9..ee332a8 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
@@ -17,12 +17,16 @@
 
 package org.apache.camel.kafkaconnector.common;
 
-import org.apache.camel.kafkaconnector.common.services.kafka.KafkaServiceFactory;
+import org.apache.camel.kafkaconnector.common.services.kafka.EmbeddedKafkaService;
 import org.apache.camel.kafkaconnector.common.services.kafkaconnect.KafkaConnectRunnerFactory;
 import org.apache.camel.kafkaconnector.common.services.kafkaconnect.KafkaConnectService;
 import org.apache.camel.kafkaconnector.common.utils.PropertyUtils;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaService;
 import org.apache.camel.test.infra.kafka.services.KafkaService;
+import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
+import org.apache.camel.test.infra.kafka.services.RemoteKafkaService;
+import org.apache.camel.test.infra.kafka.services.StrimziService;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public abstract class AbstractKafkaTest {
@@ -39,7 +43,14 @@ public abstract class AbstractKafkaTest {
     public AbstractKafkaTest() {
         PluginPathHelper.getInstance().registerConnector(getConnectorsInTest());
 
-        kafkaService = KafkaServiceFactory.createService();
+        kafkaService = KafkaServiceFactory
+                .builder()
+                .addLocalMapping(EmbeddedKafkaService::new)
+                .addRemoteMapping(RemoteKafkaService::new)
+                .addMapping("embedded", EmbeddedKafkaService::new)
+                .addMapping("local-strimzi-container", StrimziService::new)
+                .addMapping("local-cp-kafka-container", ContainerLocalKafkaService::new)
+                .build();
 
         kafkaService.initialize();
 
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/KafkaServiceFactory.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/KafkaServiceFactory.java
deleted file mode 100644
index 052ba9c..0000000
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/KafkaServiceFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.common.services.kafka;
-
-import org.apache.camel.test.infra.kafka.services.KafkaService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class KafkaServiceFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(KafkaServiceFactory.class);
-
-    private KafkaServiceFactory() {
-
-    }
-
-    public static KafkaService createService() {
-        String kafkaInstanceType = System.getProperty("kafka.instance.type");
-
-        if (kafkaInstanceType == null || kafkaInstanceType.equals("embedded")) {
-            return new EmbeddedKafkaService();
-        }
-
-        if (kafkaInstanceType.equals("local-strimzi-container")) {
-            return new StrimziService();
-        }
-
-        return org.apache.camel.test.infra.kafka.services.KafkaServiceFactory.createService();
-
-    }
-}
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/StrimziService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/StrimziService.java
deleted file mode 100644
index 6f3b03e..0000000
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/StrimziService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.common.services.kafka;
-
-import org.apache.camel.test.infra.common.TestUtils;
-import org.apache.camel.test.infra.common.services.ContainerService;
-import org.apache.camel.test.infra.kafka.common.KafkaProperties;
-import org.apache.camel.test.infra.kafka.services.KafkaService;
-import org.apache.camel.test.infra.kafka.services.StrimziContainer;
-import org.apache.camel.test.infra.kafka.services.ZookeeperContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.Network;
-
-class StrimziService implements KafkaService, ContainerService<StrimziContainer> {
-    private static final Logger LOG = LoggerFactory.getLogger(StrimziService.class);
-
-    private final ZookeeperContainer zookeeperContainer;
-    private final StrimziContainer strimziContainer;
-
-    public StrimziService() {
-        Network network = Network.newNetwork();
-
-        String zookeeperInstanceName = "zookeeper-" + TestUtils.randomWithRange(1, 100);
-        zookeeperContainer = new ZookeeperContainer(network, zookeeperInstanceName);
-
-        String strimziInstanceName = "strimzi-" + TestUtils.randomWithRange(1, 100);
-        strimziContainer = new StrimziContainer(network, strimziInstanceName, zookeeperInstanceName);
-    }
-
-    public StrimziService(ZookeeperContainer zookeeperContainer, StrimziContainer strimziContainer) {
-        this.zookeeperContainer = zookeeperContainer;
-        this.strimziContainer = strimziContainer;
-    }
-
-    protected Integer getKafkaPort() {
-        return strimziContainer.getKafkaPort();
-    }
-
-    @Override
-    public String getBootstrapServers() {
-        return strimziContainer.getContainerIpAddress() + ":" + getKafkaPort();
-    }
-
-    @Override
-    public void registerProperties() {
-        System.setProperty(KafkaProperties.KAFKA_BOOTSTRAP_SERVERS, getBootstrapServers());
-    }
-
-    @Override
-    public void initialize() {
-        zookeeperContainer.start();
-
-        String zookeeperConnect = zookeeperContainer.getContainerIpAddress() + ":" + zookeeperContainer.getZookeeperPort();
-        LOG.info("Apache Zookeeper running at address {}", zookeeperConnect);
-
-        strimziContainer.start();
-
-        registerProperties();
-        LOG.info("Kafka bootstrap server running at address {}", getBootstrapServers());
-    }
-
-    private boolean stopped() {
-        return !strimziContainer.isRunning() && !zookeeperContainer.isRunning();
-    }
-
-    @Override
-    public void shutdown() {
-        try {
-            LOG.info("Stopping Kafka container");
-            strimziContainer.stop();
-        } finally {
-            LOG.info("Stopping Zookeeper container");
-            zookeeperContainer.stop();
-
-            TestUtils.waitFor(this::stopped);
-        }
-    }
-
-    @Override
-    public StrimziContainer getContainer() {
-        return strimziContainer;
-    }
-
-    protected ZookeeperContainer getZookeeperContainer() {
-        return zookeeperContainer;
-    }
-}
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
index 24e9f9a..44e6a94 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
@@ -17,6 +17,9 @@
 
 package org.apache.camel.kafkaconnector.sjms2.common;
 
+import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
+import org.apache.camel.test.infra.messaging.services.MessagingLocalContainerService;
+
 public final class SJMS2Common {
     /**
      * The default JMS queue name used during the tests
@@ -26,4 +29,10 @@ public final class SJMS2Common {
     private SJMS2Common() {
 
     }
+
+    public static MessagingLocalContainerService<DispatchRouterContainer> createLocalService() {
+        DispatchRouterContainer container = new DispatchRouterContainer();
+
+        return new MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
+    }
 }
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkIdempotentJMSITCase.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkIdempotentJMSITCase.java
index 0b8bb52..d0273dc 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkIdempotentJMSITCase.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkIdempotentJMSITCase.java
@@ -35,9 +35,8 @@ import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.kafkaconnector.sjms2.clients.JMSClient;
 import org.apache.camel.kafkaconnector.sjms2.common.SJMS2Common;
-import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
 import org.apache.camel.test.infra.messaging.services.MessagingService;
-import org.apache.camel.test.infra.messaging.services.MessagingServiceBuilder;
+import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -55,9 +54,9 @@ import static org.junit.jupiter.api.Assertions.fail;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSinkIdempotentJMSITCase extends CamelSinkTestSupport {
     @RegisterExtension
-    public static MessagingService jmsService = MessagingServiceBuilder
-            .newBuilder(DispatchRouterContainer::new)
-            .withEndpointProvider(DispatchRouterContainer::defaultEndpoint)
+    public static MessagingService jmsService = MessagingServiceFactory
+            .builder()
+            .addLocalMapping(SJMS2Common::createLocalService)
             .build();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkIdempotentJMSITCase.class);
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkJMSITCase.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkJMSITCase.java
index 50dabe6..b56c580 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkJMSITCase.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkJMSITCase.java
@@ -30,9 +30,8 @@ import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
 import org.apache.camel.kafkaconnector.sjms2.clients.JMSClient;
 import org.apache.camel.kafkaconnector.sjms2.common.SJMS2Common;
-import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
 import org.apache.camel.test.infra.messaging.services.MessagingService;
-import org.apache.camel.test.infra.messaging.services.MessagingServiceBuilder;
+import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -50,9 +49,9 @@ import static org.junit.jupiter.api.Assertions.fail;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSinkJMSITCase extends CamelSinkTestSupport {
     @RegisterExtension
-    public static MessagingService jmsService = MessagingServiceBuilder
-            .newBuilder(DispatchRouterContainer::new)
-            .withEndpointProvider(DispatchRouterContainer::defaultEndpoint)
+    public static MessagingService jmsService = MessagingServiceFactory
+            .builder()
+            .addLocalMapping(SJMS2Common::createLocalService)
             .build();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkJMSITCase.class);
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSITCase.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSITCase.java
index 781e029..ffbee12 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSITCase.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSITCase.java
@@ -27,9 +27,8 @@ import org.apache.camel.kafkaconnector.common.test.IntegerMessageConsumer;
 import org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
 import org.apache.camel.kafkaconnector.sjms2.clients.JMSClient;
 import org.apache.camel.kafkaconnector.sjms2.common.SJMS2Common;
-import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
 import org.apache.camel.test.infra.messaging.services.MessagingService;
-import org.apache.camel.test.infra.messaging.services.MessagingServiceBuilder;
+import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -47,9 +46,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSourceJMSITCase extends CamelSourceTestSupport {
     @RegisterExtension
-    public static MessagingService jmsService = MessagingServiceBuilder
-            .newBuilder(DispatchRouterContainer::new)
-            .withEndpointProvider(DispatchRouterContainer::defaultEndpoint)
+    public static MessagingService jmsService = MessagingServiceFactory
+            .builder()
+            .addLocalMapping(SJMS2Common::createLocalService)
             .build();
 
     private String topicName;
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSWithAggregation.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSWithAggregation.java
index 6b95304..ce25c7b 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSWithAggregation.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/source/CamelSourceJMSWithAggregation.java
@@ -28,9 +28,8 @@ import org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.kafkaconnector.sjms2.clients.JMSClient;
 import org.apache.camel.kafkaconnector.sjms2.common.SJMS2Common;
-import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
 import org.apache.camel.test.infra.messaging.services.MessagingService;
-import org.apache.camel.test.infra.messaging.services.MessagingServiceBuilder;
+import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,9 +43,9 @@ import static org.junit.jupiter.api.Assertions.fail;
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CamelSourceJMSWithAggregation extends CamelSourceTestSupport {
     @RegisterExtension
-    public static MessagingService jmsService = MessagingServiceBuilder
-            .newBuilder(DispatchRouterContainer::new)
-            .withEndpointProvider(DispatchRouterContainer::defaultEndpoint)
+    public static MessagingService jmsService = MessagingServiceFactory
+            .builder()
+            .addLocalMapping(SJMS2Common::createLocalService)
             .build();
 
     private final int sentSize = 10;

[camel-kafka-connector] 04/09: Align to 3.9.0

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

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

commit df8294c326dfdd217a0334a562f7f0352137d182
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 29 07:34:43 2021 +0200

    Align to 3.9.0
---
 connectors/camel-aws-cw-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../src/generated/resources/camel-aws-cw-sink.json | 202 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-cw-kafka-sink-connector.adoc    |  80 ---
 .../examples/CamelAwscwSinkConnector.properties    |  33 --
 .../awscw/CamelAwscwSinkConnector.java             |  35 --
 .../awscw/CamelAwscwSinkConnectorConfig.java       | 158 ------
 .../kafkaconnector/awscw/CamelAwscwSinkTask.java   |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ddb-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ddb-sink.json    | 254 ---------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ddb-kafka-sink-connector.adoc   |  84 ---
 .../examples/CamelAwsddbSinkConnector.properties   |  33 --
 .../awsddb/CamelAwsddbSinkConnector.java           |  35 --
 .../awsddb/CamelAwsddbSinkConnectorConfig.java     | 174 ------
 .../kafkaconnector/awsddb/CamelAwsddbSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-ddbstream-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-aws-ddbstream-source.json      | 344 ------------
 .../src/main/assembly/package.xml                  |  56 --
 ...camel-aws-ddbstream-kafka-source-connector.adoc |  96 ----
 .../CamelAwsddbstreamSourceConnector.properties    |  33 --
 .../CamelAwsddbstreamSourceConnector.java          |  35 --
 .../CamelAwsddbstreamSourceConnectorConfig.java    | 225 --------
 .../awsddbstream/CamelAwsddbstreamSourceTask.java  |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ec2-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ec2-sink.json    | 192 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ec2-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsec2SinkConnector.properties   |  37 --
 .../awsec2/CamelAwsec2SinkConnector.java           |  35 --
 .../awsec2/CamelAwsec2SinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsec2/CamelAwsec2SinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ecs-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ecs-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ecs-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsecsSinkConnector.properties   |  37 --
 .../awsecs/CamelAwsecsSinkConnector.java           |  35 --
 .../awsecs/CamelAwsecsSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsecs/CamelAwsecsSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-eks-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-eks-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-eks-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwseksSinkConnector.properties   |  37 --
 .../awseks/CamelAwseksSinkConnector.java           |  35 --
 .../awseks/CamelAwseksSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awseks/CamelAwseksSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-iam-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-iam-sink.json    | 196 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-iam-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsiamSinkConnector.properties   |  37 --
 .../awsiam/CamelAwsiamSinkConnector.java           |  35 --
 .../awsiam/CamelAwsiamSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsiam/CamelAwsiamSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../pom.xml                                        | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../resources/camel-aws-kinesis-firehose-sink.json | 154 ------
 .../src/main/assembly/package.xml                  |  56 --
 ...-aws-kinesis-firehose-kafka-sink-connector.adoc |  72 ---
 ...CamelAwskinesisfirehoseSinkConnector.properties |  33 --
 .../CamelAwskinesisfirehoseSinkConnector.java      |  35 --
 ...CamelAwskinesisfirehoseSinkConnectorConfig.java | 129 -----
 .../CamelAwskinesisfirehoseSinkTask.java           |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-kinesis-kafka-connector/pom.xml      | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-aws-kinesis-sink.json          | 154 ------
 .../resources/camel-aws-kinesis-source.json        | 384 -------------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-kinesis-kafka-sink-connector.adoc    |  72 ---
 .../camel-aws-kinesis-kafka-source-connector.adoc  | 100 ----
 .../CamelAwskinesisSinkConnector.properties        |  33 --
 .../CamelAwskinesisSourceConnector.properties      |  33 --
 .../awskinesis/CamelAwskinesisSinkConnector.java   |  35 --
 .../CamelAwskinesisSinkConnectorConfig.java        | 128 -----
 .../awskinesis/CamelAwskinesisSinkTask.java        |  39 --
 .../awskinesis/CamelAwskinesisSourceConnector.java |  35 --
 .../CamelAwskinesisSourceConnectorConfig.java      | 240 ---------
 .../awskinesis/CamelAwskinesisSourceTask.java      |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-kms-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-kms-sink.json    | 182 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-kms-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwskmsSinkConnector.properties   |  37 --
 .../awskms/CamelAwskmsSinkConnector.java           |  35 --
 .../awskms/CamelAwskmsSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awskms/CamelAwskmsSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-lambda-kafka-connector/pom.xml       | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-lambda-sink.json | 208 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-lambda-kafka-sink-connector.adoc     |  74 ---
 .../CamelAwslambdaSinkConnector.properties         |  33 --
 .../awslambda/CamelAwslambdaSinkConnector.java     |  35 --
 .../CamelAwslambdaSinkConnectorConfig.java         | 136 -----
 .../awslambda/CamelAwslambdaSinkTask.java          |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-mq-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../src/generated/resources/camel-aws-mq-sink.json | 182 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-mq-kafka-sink-connector.adoc    |  74 ---
 .../examples/CamelAwsmqSinkConnector.properties    |  37 --
 .../awsmq/CamelAwsmqSinkConnector.java             |  35 --
 .../awsmq/CamelAwsmqSinkConnectorConfig.java       | 134 -----
 .../kafkaconnector/awsmq/CamelAwsmqSinkTask.java   |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-msk-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-msk-sink.json    | 178 ------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-msk-kafka-sink-connector.adoc   |  74 ---
 .../examples/CamelAwsmskSinkConnector.properties   |  37 --
 .../awsmsk/CamelAwsmskSinkConnector.java           |  35 --
 .../awsmsk/CamelAwsmskSinkConnectorConfig.java     | 134 -----
 .../kafkaconnector/awsmsk/CamelAwsmskSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-s3-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../src/generated/resources/camel-aws-s3-sink.json | 450 ----------------
 .../generated/resources/camel-aws-s3-source.json   | 566 -------------------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-s3-kafka-sink-connector.adoc    | 128 -----
 .../docs/camel-aws-s3-kafka-source-connector.adoc  | 168 ------
 .../examples/CamelAwss3SinkConnector.properties    |  33 --
 .../examples/CamelAwss3SourceConnector.properties  |  33 --
 .../awss3/CamelAwss3SinkConnector.java             |  35 --
 .../awss3/CamelAwss3SinkConnectorConfig.java       | 294 ----------
 .../kafkaconnector/awss3/CamelAwss3SinkTask.java   |  39 --
 .../awss3/CamelAwss3SourceConnector.java           |  35 --
 .../awss3/CamelAwss3SourceConnectorConfig.java     | 360 -------------
 .../kafkaconnector/awss3/CamelAwss3SourceTask.java |  39 --
 .../awss3/converters/S3ObjectConverter.java        |  45 --
 .../awss3/serializers/S3ObjectSerializer.java      |  59 --
 .../awss3/transformers/S3ObjectTransforms.java     |  55 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sdb-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-sdb-sink.json    | 118 ----
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sdb-kafka-sink-connector.adoc   |  65 ---
 .../examples/CamelAwssdbSinkConnector.properties   |  33 --
 .../awssdb/CamelAwssdbSinkConnector.java           |  35 --
 .../awssdb/CamelAwssdbSinkConnectorConfig.java     |  98 ----
 .../kafkaconnector/awssdb/CamelAwssdbSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-ses-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-ses-sink.json    | 202 -------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-ses-kafka-sink-connector.adoc   |  80 ---
 .../examples/CamelAwssesSinkConnector.properties   |  33 --
 .../awsses/CamelAwssesSinkConnector.java           |  35 --
 .../awsses/CamelAwssesSinkConnectorConfig.java     | 158 ------
 .../kafkaconnector/awsses/CamelAwssesSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sns-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../generated/resources/camel-aws-sns-sink.json    | 274 ----------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sns-kafka-sink-connector.adoc   |  91 ----
 .../examples/CamelAwssnsSinkConnector.properties   |  33 --
 .../awssns/CamelAwssnsSinkConnector.java           |  35 --
 .../awssns/CamelAwssnsSinkConnectorConfig.java     | 202 -------
 .../kafkaconnector/awssns/CamelAwssnsSinkTask.java |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-sqs-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-aws-sqs-sink.json    | 378 -------------
 .../generated/resources/camel-aws-sqs-source.json  | 600 ---------------------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-sqs-kafka-sink-connector.adoc   | 103 ----
 .../docs/camel-aws-sqs-kafka-source-connector.adoc | 138 -----
 .../examples/CamelAwssqsSinkConnector.properties   |  33 --
 .../examples/CamelAwssqsSourceConnector.properties |  33 --
 .../awssqs/CamelAwssqsSinkConnector.java           |  35 --
 .../awssqs/CamelAwssqsSinkConnectorConfig.java     | 250 ---------
 .../kafkaconnector/awssqs/CamelAwssqsSinkTask.java |  39 --
 .../awssqs/CamelAwssqsSourceConnector.java         |  35 --
 .../awssqs/CamelAwssqsSourceConnectorConfig.java   | 392 --------------
 .../awssqs/CamelAwssqsSourceTask.java              |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/camel-aws-swf-kafka-connector/pom.xml   | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-aws-swf-sink.json    | 314 -----------
 .../generated/resources/camel-aws-swf-source.json  | 273 ----------
 .../src/main/assembly/package.xml                  |  56 --
 .../docs/camel-aws-swf-kafka-sink-connector.adoc   |  96 ----
 .../docs/camel-aws-swf-kafka-source-connector.adoc |  92 ----
 .../examples/CamelAwsswfSinkConnector.properties   |  33 --
 .../examples/CamelAwsswfSourceConnector.properties |  33 --
 .../awsswf/CamelAwsswfSinkConnector.java           |  35 --
 .../awsswf/CamelAwsswfSinkConnectorConfig.java     | 222 --------
 .../kafkaconnector/awsswf/CamelAwsswfSinkTask.java |  39 --
 .../awsswf/CamelAwsswfSourceConnector.java         |  35 --
 .../awsswf/CamelAwsswfSourceConnectorConfig.java   | 208 -------
 .../awsswf/CamelAwsswfSourceTask.java              |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-aws-translate-kafka-connector/pom.xml    | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../resources/camel-aws-translate-sink.json        | 212 --------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-aws-translate-kafka-sink-connector.adoc  |  80 ---
 .../CamelAwstranslateSinkConnector.properties      |  37 --
 .../CamelAwstranslateSinkConnector.java            |  35 --
 .../CamelAwstranslateSinkConnectorConfig.java      | 160 ------
 .../awstranslate/CamelAwstranslateSinkTask.java    |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-azure-blob-kafka-connector/pom.xml       | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../generated/resources/camel-azure-blob-sink.json | 320 -----------
 .../resources/camel-azure-blob-source.json         | 227 --------
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-azure-blob-kafka-sink-connector.adoc     |  92 ----
 .../camel-azure-blob-kafka-source-connector.adoc   |  82 ---
 .../CamelAzureblobSinkConnector.properties         |  33 --
 .../CamelAzureblobSourceConnector.properties       |  33 --
 .../azureblob/CamelAzureblobSinkConnector.java     |  35 --
 .../CamelAzureblobSinkConnectorConfig.java         | 208 -------
 .../azureblob/CamelAzureblobSinkTask.java          |  39 --
 .../azureblob/CamelAzureblobSourceConnector.java   |  35 --
 .../CamelAzureblobSourceConnectorConfig.java       | 168 ------
 .../azureblob/CamelAzureblobSourceTask.java        |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../camel-azure-queue-kafka-connector/pom.xml      | 139 -----
 .../descriptors/connector-sink.properties          |   1 -
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-azure-queue-sink.json          | 178 ------
 .../resources/camel-azure-queue-source.json        | 125 -----
 .../src/main/assembly/package.xml                  |  56 --
 .../camel-azure-queue-kafka-sink-connector.adoc    |  74 ---
 .../camel-azure-queue-kafka-source-connector.adoc  |  68 ---
 .../CamelAzurequeueSinkConnector.properties        |  33 --
 .../CamelAzurequeueSourceConnector.properties      |  33 --
 .../azurequeue/CamelAzurequeueSinkConnector.java   |  35 --
 .../CamelAzurequeueSinkConnectorConfig.java        | 136 -----
 .../azurequeue/CamelAzurequeueSinkTask.java        |  39 --
 .../azurequeue/CamelAzurequeueSourceConnector.java |  35 --
 .../CamelAzurequeueSourceConnectorConfig.java      | 112 ----
 .../azurequeue/CamelAzurequeueSourceTask.java      |  39 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 connectors/pom.xml                                 |  20 -
 288 files changed, 27005 deletions(-)

diff --git a/connectors/camel-aws-cw-kafka-connector/pom.xml b/connectors/camel-aws-cw-kafka-connector/pom.xml
deleted file mode 100644
index a20a121..0000000
--- a/connectors/camel-aws-cw-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-cw-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-cw</name>
-  <description>Camel Kafka Connector for aws-cw</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-cw</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-cw-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-cw-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 1fa640e..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-cw-sink
\ No newline at end of file
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
deleted file mode 100644
index 313e804..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector",
-		"artifactId": "camel-aws-cw-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-cw-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Send metrics to AWS CloudWatch."
-	},
-	"properties": {
-		"camel.sink.path.namespace": {
-			"name": "camel.sink.path.namespace",
-			"description": "The metric namespace",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.amazonCwClient": {
-			"name": "camel.sink.endpoint.amazonCwClient",
-			"description": "To use the AmazonCloudWatch as the client",
-			"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 [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.name": {
-			"name": "camel.sink.endpoint.name",
-			"description": "The metric name",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the CW client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the CW client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "The region in which CW 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.timestamp": {
-			"name": "camel.sink.endpoint.timestamp",
-			"description": "The metric timestamp",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.unit": {
-			"name": "camel.sink.endpoint.unit",
-			"description": "The metric unit",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.value": {
-			"name": "camel.sink.endpoint.value",
-			"description": "The metric value",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.accessKey": {
-			"name": "camel.sink.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.amazonCwClient": {
-			"name": "camel.component.aws-cw.amazonCwClient",
-			"description": "To use the AmazonCloudWatch as the client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.autoDiscoverClient": {
-			"name": "camel.component.aws-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.aws-cw.configuration": {
-			"name": "camel.component.aws-cw.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.lazyStartProducer": {
-			"name": "camel.component.aws-cw.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.name": {
-			"name": "camel.component.aws-cw.name",
-			"description": "The metric name",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.proxyHost": {
-			"name": "camel.component.aws-cw.proxyHost",
-			"description": "To define a proxy host when instantiating the CW client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.proxyPort": {
-			"name": "camel.component.aws-cw.proxyPort",
-			"description": "To define a proxy port when instantiating the CW client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.proxyProtocol": {
-			"name": "camel.component.aws-cw.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-cw.region": {
-			"name": "camel.component.aws-cw.region",
-			"description": "The region in which CW 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.timestamp": {
-			"name": "camel.component.aws-cw.timestamp",
-			"description": "The metric timestamp",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.unit": {
-			"name": "camel.component.aws-cw.unit",
-			"description": "The metric unit",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.value": {
-			"name": "camel.component.aws-cw.value",
-			"description": "The metric value",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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": {
-			"name": "camel.component.aws-cw.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-cw.secretKey": {
-			"name": "camel.component.aws-cw.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-cw-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index c8a9fa8..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,80 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-cw-kafka-connector-sink]]
-= camel-aws-cw-kafka-connector sink configuration
-
-Connector Description: Send metrics to AWS CloudWatch.
-
-When using camel-aws-cw-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-cw-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector
-----
-
-
-The camel-aws-cw sink connector supports 29 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *camel.sink.endpoint.region* | The region in which CW 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.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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-cw.amazonCwClient* | To use the AmazonCloudWatch as the client | null | false | MEDIUM
-| *camel.component.aws-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.aws-cw.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-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.aws-cw.name* | The metric name | null | false | MEDIUM
-| *camel.component.aws-cw.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
-| *camel.component.aws-cw.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
-| *camel.component.aws-cw.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *camel.component.aws-cw.region* | The region in which CW 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-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.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
-|===
-
-
-
-The camel-aws-cw sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-cw sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-cw sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/docs/examples/CamelAwscwSinkConnector.properties b/connectors/camel-aws-cw-kafka-connector/src/main/docs/examples/CamelAwscwSinkConnector.properties
deleted file mode 100644
index 3420280..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/docs/examples/CamelAwscwSinkConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-cwSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The metric namespace
-camel.sink.path.namespace=
-
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnector.java b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnector.java
deleted file mode 100644
index 80202a9..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscw;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscwSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwscwSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwscwSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 6b11b91..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscw;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSCW_PATH_NAMESPACE_CONF = "camel.sink.path.namespace";
-    public static final String CAMEL_SINK_AWSCW_PATH_NAMESPACE_DOC = "The metric namespace";
-    public static final String CAMEL_SINK_AWSCW_PATH_NAMESPACE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_CONF = "camel.sink.endpoint.amazonCwClient";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSCW_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_AWSCW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSCW_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_AWSCW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_NAME_CONF = "camel.sink.endpoint.name";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_NAME_DOC = "The metric name";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the CW client";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_REGION_DOC = "The region in which CW 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_AWSCW_ENDPOINT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_CONF = "camel.sink.endpoint.timestamp";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DOC = "The metric timestamp";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_UNIT_CONF = "camel.sink.endpoint.unit";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DOC = "The metric unit";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DEFAULT = null;
-    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_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_CONF = "camel.component.aws-cw.amazonCwClient";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-cw.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSCW_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_AWSCW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-cw.configuration";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-cw.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSCW_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_AWSCW_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_NAME_CONF = "camel.component.aws-cw.name";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_NAME_DOC = "The metric name";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-cw.proxyHost";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-cw.proxyPort";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the CW client";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-cw.proxyProtocol";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_REGION_CONF = "camel.component.aws-cw.region";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_REGION_DOC = "The region in which CW 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_AWSCW_COMPONENT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_CONF = "camel.component.aws-cw.timestamp";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DOC = "The metric timestamp";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_UNIT_CONF = "camel.component.aws-cw.unit";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_UNIT_DOC = "The metric unit";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_UNIT_DEFAULT = null;
-    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_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;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-cw.secretKey";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DEFAULT = null;
-
-    public CamelAwscwSinkConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwscwSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSCW_PATH_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_PATH_NAMESPACE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSCW_PATH_NAMESPACE_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PORT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_PROXY_PROTOCOL_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_REGION_DOC);
-        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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_PROXY_PORT_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_PROXY_PROTOCOL_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_REGION_DOC);
-        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_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.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkTask.java b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkTask.java
deleted file mode 100644
index 941b7b3..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscw;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscwSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwscwSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-cw");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-cw-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-ddb-kafka-connector/pom.xml b/connectors/camel-aws-ddb-kafka-connector/pom.xml
deleted file mode 100644
index fff441c..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-ddb-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-ddb</name>
-  <description>Camel Kafka Connector for aws-ddb</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-ddb</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-ddb-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 6e81c2b..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-ddb-sink
\ No newline at end of file
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
deleted file mode 100644
index 237f4ed..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector",
-		"artifactId": "camel-aws-ddb-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-ddb-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Store and retrieve data from AWS DynamoDB service."
-	},
-	"properties": {
-		"camel.sink.path.tableName": {
-			"name": "camel.sink.path.tableName",
-			"description": "The name of the table currently worked with.",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.amazonDDBClient": {
-			"name": "camel.sink.endpoint.amazonDDBClient",
-			"description": "To use the AmazonDynamoDB as the client",
-			"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.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.keyAttributeName": {
-			"name": "camel.sink.endpoint.keyAttributeName",
-			"description": "Attribute name when creating table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.keyAttributeType": {
-			"name": "camel.sink.endpoint.keyAttributeType",
-			"description": "Attribute type when creating table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]",
-			"defaultValue": "\"PutItem\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"BatchGetItems",
-				"DeleteItem",
-				"DeleteTable",
-				"DescribeTable",
-				"GetItem",
-				"PutItem",
-				"Query",
-				"Scan",
-				"UpdateItem",
-				"UpdateTable"
-			]
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the DDB client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the DDB client. 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.readCapacity": {
-			"name": "camel.sink.endpoint.readCapacity",
-			"description": "The provisioned throughput to reserve for reading resources from your table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "The region in which DDB client needs to work",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.writeCapacity": {
-			"name": "camel.sink.endpoint.writeCapacity",
-			"description": "The provisioned throughput to reserved for writing resources to your table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.accessKey": {
-			"name": "camel.sink.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.amazonDDBClient": {
-			"name": "camel.component.aws-ddb.amazonDDBClient",
-			"description": "To use the AmazonDynamoDB as the client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.autoDiscoverClient": {
-			"name": "camel.component.aws-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.aws-ddb.configuration": {
-			"name": "camel.component.aws-ddb.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.consistentRead": {
-			"name": "camel.component.aws-ddb.consistentRead",
-			"description": "Determines whether or not strong consistency should be enforced when data is read.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.keyAttributeName": {
-			"name": "camel.component.aws-ddb.keyAttributeName",
-			"description": "Attribute name when creating table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.keyAttributeType": {
-			"name": "camel.component.aws-ddb.keyAttributeType",
-			"description": "Attribute type when creating table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.lazyStartProducer": {
-			"name": "camel.component.aws-ddb.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.operation": {
-			"name": "camel.component.aws-ddb.operation",
-			"description": "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]",
-			"defaultValue": "\"PutItem\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"BatchGetItems",
-				"DeleteItem",
-				"DeleteTable",
-				"DescribeTable",
-				"GetItem",
-				"PutItem",
-				"Query",
-				"Scan",
-				"UpdateItem",
-				"UpdateTable"
-			]
-		},
-		"camel.component.aws-ddb.proxyHost": {
-			"name": "camel.component.aws-ddb.proxyHost",
-			"description": "To define a proxy host when instantiating the DDB client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.proxyPort": {
-			"name": "camel.component.aws-ddb.proxyPort",
-			"description": "To define a proxy port when instantiating the DDB client. 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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.proxyProtocol": {
-			"name": "camel.component.aws-ddb.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-ddb.readCapacity": {
-			"name": "camel.component.aws-ddb.readCapacity",
-			"description": "The provisioned throughput to reserve for reading resources from your table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.region": {
-			"name": "camel.component.aws-ddb.region",
-			"description": "The region in which DDB client needs to work",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.writeCapacity": {
-			"name": "camel.component.aws-ddb.writeCapacity",
-			"description": "The provisioned throughput to reserved for writing resources to your table",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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": {
-			"name": "camel.component.aws-ddb.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddb.secretKey": {
-			"name": "camel.component.aws-ddb.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ddb-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index d6bbaeb..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,84 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-ddb-kafka-connector-sink]]
-= camel-aws-ddb-kafka-connector sink configuration
-
-Connector Description: Store and retrieve data from AWS DynamoDB service.
-
-When using camel-aws-ddb-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-ddb-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector
-----
-
-
-The camel-aws-ddb sink connector supports 33 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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
-| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
-| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the DDB client. 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.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ddb.amazonDDBClient* | To use the AmazonDynamoDB as the client | null | false | MEDIUM
-| *camel.component.aws-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.aws-ddb.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-ddb.consistentRead* | Determines whether or not strong consistency should be enforced when data is read. | false | false | MEDIUM
-| *camel.component.aws-ddb.keyAttributeName* | Attribute name when creating table | null | false | MEDIUM
-| *camel.component.aws-ddb.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
-| *camel.component.aws-ddb.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-ddb.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
-| *camel.component.aws-ddb.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
-| *camel.component.aws-ddb.proxyPort* | To define a proxy port when instantiating the DDB client. 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-ddb.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-ddb sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-ddb sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-ddb sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/examples/CamelAwsddbSinkConnector.properties b/connectors/camel-aws-ddb-kafka-connector/src/main/docs/examples/CamelAwsddbSinkConnector.properties
deleted file mode 100644
index 0e0c462..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/examples/CamelAwsddbSinkConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-ddbSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The name of the table currently worked with.
-camel.sink.path.tableName=
-
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnector.java b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnector.java
deleted file mode 100644
index ef07c46..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddb;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwsddbSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsddbSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 91272c4..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddb;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_CONF = "camel.sink.path.tableName";
-    public static final String CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_DOC = "The name of the table currently worked with.";
-    public static final String CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_CONF = "camel.sink.endpoint.amazonDDBClient";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSDDB_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_AWSDDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_CONF = "camel.sink.endpoint.consistentRead";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_DOC = "Determines whether or not strong consistency should be enforced when data is read.";
-    public static final Boolean CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_CONF = "camel.sink.endpoint.keyAttributeName";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DOC = "Attribute name when creating table";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_CONF = "camel.sink.endpoint.keyAttributeType";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DOC = "Attribute type when creating table";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSDDB_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_AWSDDB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_DEFAULT = "PutItem";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the DDB client. 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_AWSDDB_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_CONF = "camel.sink.endpoint.readCapacity";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DOC = "The provisioned throughput to reserve for reading resources from your table";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DOC = "The region in which DDB client needs to work";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DEFAULT = null;
-    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_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_CONF = "camel.component.aws-ddb.amazonDDBClient";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-ddb.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSDDB_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_AWSDDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-ddb.configuration";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_CONF = "camel.component.aws-ddb.consistentRead";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_DOC = "Determines whether or not strong consistency should be enforced when data is read.";
-    public static final Boolean CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_CONF = "camel.component.aws-ddb.keyAttributeName";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_DOC = "Attribute name when creating table";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_CONF = "camel.component.aws-ddb.keyAttributeType";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DOC = "Attribute type when creating table";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-ddb.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSDDB_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_AWSDDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_CONF = "camel.component.aws-ddb.operation";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_DEFAULT = "PutItem";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-ddb.proxyHost";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-ddb.proxyPort";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the DDB client. 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_AWSDDB_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-ddb.proxyProtocol";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_CONF = "camel.component.aws-ddb.readCapacity";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DOC = "The provisioned throughput to reserve for reading resources from your table";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_REGION_CONF = "camel.component.aws-ddb.region";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_REGION_DOC = "The region in which DDB client needs to work";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_REGION_DEFAULT = null;
-    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_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;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ddb.secretKey";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DEFAULT = null;
-
-    public CamelAwsddbSinkConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwsddbSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSDDB_PATH_TABLE_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_CONSISTENT_READ_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PORT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_PROXY_PROTOCOL_DOC);
-        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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_CONSISTENT_READ_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PORT_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_PROXY_PROTOCOL_DOC);
-        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_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.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkTask.java b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkTask.java
deleted file mode 100644
index a74f912..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddb;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsddbSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-ddb");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/pom.xml b/connectors/camel-aws-ddbstream-kafka-connector/pom.xml
deleted file mode 100644
index 49def24..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-ddbstream-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-ddbstream</name>
-  <description>Camel Kafka Connector for aws-ddbstream</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-ddb</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/descriptors/connector-source.properties
deleted file mode 100644
index 543e8cb..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/descriptors/connector-source.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-ddbstream-source
\ No newline at end of file
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
deleted file mode 100644
index 13e088a..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
+++ /dev/null
@@ -1,344 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSourceConnector",
-		"artifactId": "camel-aws-ddbstream-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-ddbstream-source",
-		"type": "source",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Receive messages from AWS DynamoDB Stream service."
-	},
-	"properties": {
-		"camel.source.path.tableName": {
-			"name": "camel.source.path.tableName",
-			"description": "Name of the dynamodb table",
-			"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",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.bridgeErrorHandler": {
-			"name": "camel.source.endpoint.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.iteratorType": {
-			"name": "camel.source.endpoint.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER"
-			]
-		},
-		"camel.source.endpoint.maxResultsPerRequest": {
-			"name": "camel.source.endpoint.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.proxyHost": {
-			"name": "camel.source.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.proxyPort": {
-			"name": "camel.source.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.proxyProtocol": {
-			"name": "camel.source.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.source.endpoint.region": {
-			"name": "camel.source.endpoint.region",
-			"description": "The region in which DDBStreams client needs to work",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
-			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
-			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.sequenceNumberProvider": {
-			"name": "camel.source.endpoint.sequenceNumberProvider",
-			"description": "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.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.exceptionHandler": {
-			"name": "camel.source.endpoint.exceptionHandler",
-			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.exchangePattern": {
-			"name": "camel.source.endpoint.exchangePattern",
-			"description": "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"InOnly",
-				"InOut",
-				"InOptionalOut"
-			]
-		},
-		"camel.source.endpoint.pollStrategy": {
-			"name": "camel.source.endpoint.pollStrategy",
-			"description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffErrorThreshold": {
-			"name": "camel.source.endpoint.backoffErrorThreshold",
-			"description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffIdleThreshold": {
-			"name": "camel.source.endpoint.backoffIdleThreshold",
-			"description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffMultiplier": {
-			"name": "camel.source.endpoint.backoffMultiplier",
-			"description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and\/or backoffErrorThreshold must also be configured.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.delay": {
-			"name": "camel.source.endpoint.delay",
-			"description": "Milliseconds before the next poll.",
-			"defaultValue": "500L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.greedy": {
-			"name": "camel.source.endpoint.greedy",
-			"description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.initialDelay": {
-			"name": "camel.source.endpoint.initialDelay",
-			"description": "Milliseconds before the first poll starts.",
-			"defaultValue": "1000L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.repeatCount": {
-			"name": "camel.source.endpoint.repeatCount",
-			"description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.",
-			"defaultValue": "0L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.runLoggingLevel": {
-			"name": "camel.source.endpoint.runLoggingLevel",
-			"description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]",
-			"defaultValue": "\"TRACE\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRACE",
-				"DEBUG",
-				"INFO",
-				"WARN",
-				"ERROR",
-				"OFF"
-			]
-		},
-		"camel.source.endpoint.scheduledExecutorService": {
-			"name": "camel.source.endpoint.scheduledExecutorService",
-			"description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.scheduler": {
-			"name": "camel.source.endpoint.scheduler",
-			"description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler",
-			"defaultValue": "\"none\"",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.schedulerProperties": {
-			"name": "camel.source.endpoint.schedulerProperties",
-			"description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.startScheduler": {
-			"name": "camel.source.endpoint.startScheduler",
-			"description": "Whether the scheduler should be auto started.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.timeUnit": {
-			"name": "camel.source.endpoint.timeUnit",
-			"description": "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]",
-			"defaultValue": "\"MILLISECONDS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"NANOSECONDS",
-				"MICROSECONDS",
-				"MILLISECONDS",
-				"SECONDS",
-				"MINUTES",
-				"HOURS",
-				"DAYS"
-			]
-		},
-		"camel.source.endpoint.useFixedDelay": {
-			"name": "camel.source.endpoint.useFixedDelay",
-			"description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.accessKey": {
-			"name": "camel.source.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.secretKey": {
-			"name": "camel.source.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.autoDiscoverClient": {
-			"name": "camel.component.aws-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.aws-ddbstream.amazonDynamoDbStreamsClient": {
-			"name": "camel.component.aws-ddbstream.amazonDynamoDbStreamsClient",
-			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.bridgeErrorHandler": {
-			"name": "camel.component.aws-ddbstream.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.configuration": {
-			"name": "camel.component.aws-ddbstream.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.iteratorType": {
-			"name": "camel.component.aws-ddbstream.iteratorType",
-			"description": "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]",
-			"defaultValue": "\"LATEST\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER"
-			]
-		},
-		"camel.component.aws-ddbstream.maxResultsPerRequest": {
-			"name": "camel.component.aws-ddbstream.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.proxyHost": {
-			"name": "camel.component.aws-ddbstream.proxyHost",
-			"description": "To define a proxy host when instantiating the DDBStreams client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.proxyPort": {
-			"name": "camel.component.aws-ddbstream.proxyPort",
-			"description": "To define a proxy port when instantiating the DDBStreams client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.proxyProtocol": {
-			"name": "camel.component.aws-ddbstream.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-ddbstream.region": {
-			"name": "camel.component.aws-ddbstream.region",
-			"description": "The region in which DDBStreams client needs to work",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.sequenceNumberProvider": {
-			"name": "camel.component.aws-ddbstream.sequenceNumberProvider",
-			"description": "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.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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": {
-			"name": "camel.component.aws-ddbstream.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ddbstream.secretKey": {
-			"name": "camel.component.aws-ddbstream.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ddbstream-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index e1427b2..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
+++ /dev/null
@@ -1,96 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-ddbstream-kafka-connector-source]]
-= camel-aws-ddbstream-kafka-connector source configuration
-
-Connector description: Receive messages from AWS DynamoDB Stream service.
-
-When using camel-aws-ddbstream-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-ddbstream-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Source connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSourceConnector
-----
-
-
-The camel-aws-ddbstream source connector supports 45 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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] | "LATEST" | false | MEDIUM
-| *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
-| *camel.source.endpoint.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
-| *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
-| *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *camel.source.endpoint.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
-| *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
-| *camel.source.endpoint.sequenceNumberProvider* | 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.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.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
-| *camel.source.endpoint.backoffMultiplier* | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | null | false | MEDIUM
-| *camel.source.endpoint.delay* | Milliseconds before the next poll. | 500L | false | MEDIUM
-| *camel.source.endpoint.greedy* | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | false | MEDIUM
-| *camel.source.endpoint.initialDelay* | Milliseconds before the first poll starts. | 1000L | false | MEDIUM
-| *camel.source.endpoint.repeatCount* | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0L | false | MEDIUM
-| *camel.source.endpoint.runLoggingLevel* | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "TRACE" | false | MEDIUM
-| *camel.source.endpoint.scheduledExecutorService* | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | null | false | MEDIUM
-| *camel.source.endpoint.scheduler* | To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler | "none" | false | MEDIUM
-| *camel.source.endpoint.schedulerProperties* | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | null | false | MEDIUM
-| *camel.source.endpoint.startScheduler* | Whether the scheduler should be auto started. | true | false | MEDIUM
-| *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.source.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ddbstream.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-ddbstream.amazonDynamoDb StreamsClient* | Amazon DynamoDB client to use for all requests for this endpoint | null | false | MEDIUM
-| *camel.component.aws-ddbstream.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.aws-ddbstream.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-ddbstream.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] | "LATEST" | false | MEDIUM
-| *camel.component.aws-ddbstream.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
-| *camel.component.aws-ddbstream.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
-| *camel.component.aws-ddbstream.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-ddbstream source connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-ddbstream source connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-ddbstream source connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/examples/CamelAwsddbstreamSourceConnector.properties b/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/examples/CamelAwsddbstreamSourceConnector.properties
deleted file mode 100644
index 590b896..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/examples/CamelAwsddbstreamSourceConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-ddbstreamSourceConnector
-connector.class=org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSourceConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to send messages into
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# Name of the dynamodb table
-camel.source.path.tableName=
-
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnector.java b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnector.java
deleted file mode 100644
index ee6f5a8..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddbstream;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbstreamSourceConnector extends CamelSourceConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwsddbstreamSourceConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsddbstreamSourceTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 01bf9b9..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddbstream;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbstreamSourceConnectorConfig
-        extends
-            CamelSourceConnectorConfig {
-
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_CONF = "camel.source.path.tableName";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_DOC = "Name of the dynamodb table";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.source.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_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_SOURCE_AWSDDBSTREAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_CONF = "camel.source.endpoint.amazonDynamoDbStreamsClient";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DOC = "Amazon DynamoDB client to use for all requests for this endpoint";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level an [...]
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_CONF = "camel.source.endpoint.iteratorType";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_DOC = "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]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_DEFAULT = "LATEST";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF = "camel.source.endpoint.maxResultsPerRequest";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
-    public static final Integer CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_CONF = "camel.source.endpoint.proxyHost";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_CONF = "camel.source.endpoint.proxyPort";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the DDBStreams client";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.source.endpoint.proxyProtocol";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_CONF = "camel.source.endpoint.region";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_DOC = "The region in which DDBStreams client needs to work";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF = "camel.source.endpoint.sendEmptyMessageWhenIdle";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_CONF = "camel.source.endpoint.sequenceNumberProvider";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_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_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_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_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    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_BACKOFF_ERROR_THRESHOLD_CONF = "camel.source.endpoint.backoffErrorThreshold";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC = "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.";
-    public static final Integer CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF = "camel.source.endpoint.backoffIdleThreshold";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC = "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.";
-    public static final Integer CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_CONF = "camel.source.endpoint.backoffMultiplier";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_DOC = "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.";
-    public static final Integer CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_CONF = "camel.source.endpoint.delay";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_DOC = "Milliseconds before the next poll.";
-    public static final Long CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_DEFAULT = 500L;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_CONF = "camel.source.endpoint.greedy";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_DOC = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_CONF = "camel.source.endpoint.initialDelay";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_DOC = "Milliseconds before the first poll starts.";
-    public static final Long CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_DEFAULT = 1000L;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_CONF = "camel.source.endpoint.repeatCount";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_DOC = "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.";
-    public static final Long CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_DEFAULT = 0L;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_CONF = "camel.source.endpoint.runLoggingLevel";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_DOC = "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_DEFAULT = "TRACE";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_CONF = "camel.source.endpoint.scheduledExecutorService";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DOC = "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_CONF = "camel.source.endpoint.scheduler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_DOC = "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_DEFAULT = "none";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_CONF = "camel.source.endpoint.schedulerProperties";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_DOC = "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_CONF = "camel.source.endpoint.startScheduler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_DOC = "Whether the scheduler should be auto started.";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_CONF = "camel.source.endpoint.timeUnit";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_DOC = "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_DEFAULT = "MILLISECONDS";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_CONF = "camel.source.endpoint.useFixedDelay";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_DOC = "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_CONF = "camel.source.endpoint.accessKey";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_CONF = "camel.source.endpoint.secretKey";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-ddbstream.autoDiscoverClient";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_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_SOURCE_AWSDDBSTREAM_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_CONF = "camel.component.aws-ddbstream.amazonDynamoDbStreamsClient";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DOC = "Amazon DynamoDB client to use for all requests for this endpoint";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.aws-ddbstream.bridgeErrorHandler";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_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 a [...]
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-ddbstream.configuration";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_CONF = "camel.component.aws-ddbstream.iteratorType";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_DOC = "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]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_DEFAULT = "LATEST";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF = "camel.component.aws-ddbstream.maxResultsPerRequest";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
-    public static final Integer CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-ddbstream.proxyHost";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-ddbstream.proxyPort";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the DDBStreams client";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-ddbstream.proxyProtocol";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_CONF = "camel.component.aws-ddbstream.region";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DOC = "The region in which DDBStreams client needs to work";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DEFAULT = null;
-    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_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;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ddbstream.secretKey";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT = null;
-
-    public CamelAwsddbstreamSourceConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwsddbstreamSourceConnectorConfig(
-            Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSDDBSTREAM_PATH_TABLE_NAME_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ITERATOR_TYPE_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PORT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REGION_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DOC);
-        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_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);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_MULTIPLIER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_DELAY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_GREEDY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_INITIAL_DELAY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_REPEAT_COUNT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_RUN_LOGGING_LEVEL_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SCHEDULER_PROPERTIES_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_START_SCHEDULER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_TIME_UNIT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_USE_FIXED_DELAY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AMAZON_DYNAMO_DB_STREAMS_CLIENT_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ITERATOR_TYPE_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PORT_DOC);
-        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_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.PASSWORD, 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.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceTask.java b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceTask.java
deleted file mode 100644
index 9a5e268..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddbstream;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbstreamSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsddbstreamSourceConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "aws-ddbstream");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-ec2-kafka-connector/pom.xml b/connectors/camel-aws-ec2-kafka-connector/pom.xml
deleted file mode 100644
index 38f1062..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-ec2-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-ec2</name>
-  <description>Camel Kafka Connector for aws-ec2</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-ec2</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-ec2-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 68d4438..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-ec2-sink
\ No newline at end of file
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
deleted file mode 100644
index 6ae7d8b..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awsec2.CamelAwsec2SinkConnector",
-		"artifactId": "camel-aws-ec2-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-ec2-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Manage AWS EC2 instances."
-	},
-	"properties": {
-		"camel.sink.path.label": {
-			"name": "camel.sink.path.label",
-			"description": "Logical name",
-			"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",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.amazonEc2Client": {
-			"name": "camel.sink.endpoint.amazonEc2Client",
-			"description": "To use a existing configured AmazonEC2Client as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"createAndRunInstances",
-				"startInstances",
-				"stopInstances",
-				"terminateInstances",
-				"describeInstances",
-				"describeInstancesStatus",
-				"rebootInstances",
-				"monitorInstances",
-				"unmonitorInstances",
-				"createTags",
-				"deleteTags"
-			]
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the EC2 client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the EC2 client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.autoDiscoverClient": {
-			"name": "camel.component.aws-ec2.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.accessKey": {
-			"name": "camel.component.aws-ec2.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.amazonEc2Client": {
-			"name": "camel.component.aws-ec2.amazonEc2Client",
-			"description": "To use a existing configured AmazonEC2Client as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.configuration": {
-			"name": "camel.component.aws-ec2.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.lazyStartProducer": {
-			"name": "camel.component.aws-ec2.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.operation": {
-			"name": "camel.component.aws-ec2.operation",
-			"description": "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"createAndRunInstances",
-				"startInstances",
-				"stopInstances",
-				"terminateInstances",
-				"describeInstances",
-				"describeInstancesStatus",
-				"rebootInstances",
-				"monitorInstances",
-				"unmonitorInstances",
-				"createTags",
-				"deleteTags"
-			]
-		},
-		"camel.component.aws-ec2.proxyHost": {
-			"name": "camel.component.aws-ec2.proxyHost",
-			"description": "To define a proxy host when instantiating the EC2 client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.proxyPort": {
-			"name": "camel.component.aws-ec2.proxyPort",
-			"description": "To define a proxy port when instantiating the EC2 client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.proxyProtocol": {
-			"name": "camel.component.aws-ec2.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-ec2.region": {
-			"name": "camel.component.aws-ec2.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ec2.secretKey": {
-			"name": "camel.component.aws-ec2.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ec2-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index 068b959..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,74 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-ec2-kafka-connector-sink]]
-= camel-aws-ec2-kafka-connector sink configuration
-
-Connector Description: Manage AWS EC2 instances.
-
-When using camel-aws-ec2-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-ec2-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awsec2.CamelAwsec2SinkConnector
-----
-
-
-The camel-aws-ec2 sink connector supports 23 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | 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.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | null [...]
-| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
-| *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.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
-| *camel.component.aws-ec2.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | null | false | MEDIUM
-| *camel.component.aws-ec2.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-ec2.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-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] |  [...]
-| *camel.component.aws-ec2.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
-| *camel.component.aws-ec2.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-ec2 sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-ec2 sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-ec2 sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/examples/CamelAwsec2SinkConnector.properties b/connectors/camel-aws-ec2-kafka-connector/src/main/docs/examples/CamelAwsec2SinkConnector.properties
deleted file mode 100644
index 49549bf..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/examples/CamelAwsec2SinkConnector.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-ec2SinkConnector
-connector.class=org.apache.camel.kafkaconnector.awsec2.CamelAwsec2SinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags]
-camel.component.aws-ec2.operation=
-# The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags]
-camel.sink.endpoint.operation=
-# Logical name
-camel.sink.path.label=
-
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnector.java b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnector.java
deleted file mode 100644
index 6742304..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsec2;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsec2SinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwsec2SinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsec2SinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 5f4a22b..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsec2;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSEC2_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_AWSEC2_PATH_LABEL_DOC = "Logical name";
-    public static final String CAMEL_SINK_AWSEC2_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSEC2_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_AWSEC2_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_CONF = "camel.sink.endpoint.amazonEc2Client";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_DOC = "To use a existing configured AmazonEC2Client as client";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSEC2_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_AWSEC2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInst [...]
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the EC2 client";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the EC2 client";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DEFAULT = null;
-    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_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-ec2.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSEC2_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_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ec2.accessKey";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_CONF = "camel.component.aws-ec2.amazonEc2Client";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_DOC = "To use a existing configured AmazonEC2Client as client";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-ec2.configuration";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-ec2.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSEC2_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_AWSEC2_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_CONF = "camel.component.aws-ec2.operation";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorIns [...]
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-ec2.proxyHost";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the EC2 client";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-ec2.proxyPort";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the EC2 client";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-ec2.proxyProtocol";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_REGION_CONF = "camel.component.aws-ec2.region";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_REGION_DEFAULT = null;
-    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_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,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwsec2SinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSEC2_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_AMAZON_EC_2CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_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.PASSWORD, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_AMAZON_EC_2CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_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-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkTask.java b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkTask.java
deleted file mode 100644
index cfcd293..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsec2;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsec2SinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsec2SinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-ec2");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-ecs-kafka-connector/pom.xml b/connectors/camel-aws-ecs-kafka-connector/pom.xml
deleted file mode 100644
index f982d3c..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-ecs-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-ecs</name>
-  <description>Camel Kafka Connector for aws-ecs</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-ecs</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-ecs-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 2b38b81..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-ecs-sink
\ 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
deleted file mode 100644
index 601c4ae..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awsecs.CamelAwsecsSinkConnector",
-		"artifactId": "camel-aws-ecs-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-ecs-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Manage AWS ECS cluster instances."
-	},
-	"properties": {
-		"camel.sink.path.label": {
-			"name": "camel.sink.path.label",
-			"description": "Logical name",
-			"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",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.ecsClient": {
-			"name": "camel.sink.endpoint.ecsClient",
-			"description": "To use a existing configured AWS ECS as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listClusters",
-				"describeCluster",
-				"createCluster",
-				"deleteCluster"
-			]
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the ECS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the ECS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.autoDiscoverClient": {
-			"name": "camel.component.aws-ecs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.accessKey": {
-			"name": "camel.component.aws-ecs.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.configuration": {
-			"name": "camel.component.aws-ecs.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.ecsClient": {
-			"name": "camel.component.aws-ecs.ecsClient",
-			"description": "To use a existing configured AWS ECS as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.lazyStartProducer": {
-			"name": "camel.component.aws-ecs.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.operation": {
-			"name": "camel.component.aws-ecs.operation",
-			"description": "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listClusters",
-				"describeCluster",
-				"createCluster",
-				"deleteCluster"
-			]
-		},
-		"camel.component.aws-ecs.proxyHost": {
-			"name": "camel.component.aws-ecs.proxyHost",
-			"description": "To define a proxy host when instantiating the ECS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.proxyPort": {
-			"name": "camel.component.aws-ecs.proxyPort",
-			"description": "To define a proxy port when instantiating the ECS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.proxyProtocol": {
-			"name": "camel.component.aws-ecs.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-ecs.region": {
-			"name": "camel.component.aws-ecs.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-ecs.secretKey": {
-			"name": "camel.component.aws-ecs.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ecs-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index 69318a3..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,74 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-ecs-kafka-connector-sink]]
-= camel-aws-ecs-kafka-connector sink configuration
-
-Connector Description: Manage AWS ECS cluster instances.
-
-When using camel-aws-ecs-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-ecs-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awsecs.CamelAwsecsSinkConnector
-----
-
-
-The camel-aws-ecs sink connector supports 23 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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.ecsClient* | To use a existing configured AWS ECS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
-| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
-| *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.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
-| *camel.component.aws-ecs.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-ecs.ecsClient* | To use a existing configured AWS ECS as client | null | false | MEDIUM
-| *camel.component.aws-ecs.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-ecs.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
-| *camel.component.aws-ecs.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
-| *camel.component.aws-ecs.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-ecs sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-ecs sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-ecs sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/examples/CamelAwsecsSinkConnector.properties b/connectors/camel-aws-ecs-kafka-connector/src/main/docs/examples/CamelAwsecsSinkConnector.properties
deleted file mode 100644
index dc3662e..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/examples/CamelAwsecsSinkConnector.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-ecsSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awsecs.CamelAwsecsSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]
-camel.component.aws-ecs.operation=
-# The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]
-camel.sink.endpoint.operation=
-# Logical name
-camel.sink.path.label=
-
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnector.java b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnector.java
deleted file mode 100644
index 32c1841..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsecs;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsecsSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwsecsSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsecsSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 992649a..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsecs;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSECS_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_AWSECS_PATH_LABEL_DOC = "Logical name";
-    public static final String CAMEL_SINK_AWSECS_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSECS_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_AWSECS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_CONF = "camel.sink.endpoint.ecsClient";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_DOC = "To use a existing configured AWS ECS as client";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSECS_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_AWSECS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the ECS client";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the ECS client";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_REGION_DEFAULT = null;
-    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_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-ecs.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSECS_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_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ecs.accessKey";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-ecs.configuration";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_CONF = "camel.component.aws-ecs.ecsClient";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_DOC = "To use a existing configured AWS ECS as client";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-ecs.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSECS_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_AWSECS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_OPERATION_CONF = "camel.component.aws-ecs.operation";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-ecs.proxyHost";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the ECS client";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-ecs.proxyPort";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the ECS client";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-ecs.proxyProtocol";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_REGION_CONF = "camel.component.aws-ecs.region";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_REGION_DEFAULT = null;
-    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_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,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwsecsSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSECS_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSECS_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_ECS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSECS_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_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.PASSWORD, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_ECS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSECS_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_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-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkTask.java b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkTask.java
deleted file mode 100644
index 73615a3..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsecs;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsecsSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsecsSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-ecs");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-eks-kafka-connector/pom.xml b/connectors/camel-aws-eks-kafka-connector/pom.xml
deleted file mode 100644
index 4b8f812..0000000
--- a/connectors/camel-aws-eks-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-eks-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-eks</name>
-  <description>Camel Kafka Connector for aws-eks</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-eks</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-eks-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-eks-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 57c933f..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-eks-sink
\ 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
deleted file mode 100644
index f49e88a..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awseks.CamelAwseksSinkConnector",
-		"artifactId": "camel-aws-eks-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-eks-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Manage AWS EKS cluster instances."
-	},
-	"properties": {
-		"camel.sink.path.label": {
-			"name": "camel.sink.path.label",
-			"description": "Logical name",
-			"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",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.eksClient": {
-			"name": "camel.sink.endpoint.eksClient",
-			"description": "To use a existing configured AWS EKS as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listClusters",
-				"describeCluster",
-				"createCluster",
-				"deleteCluster"
-			]
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the EKS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the EKS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.autoDiscoverClient": {
-			"name": "camel.component.aws-eks.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.accessKey": {
-			"name": "camel.component.aws-eks.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.configuration": {
-			"name": "camel.component.aws-eks.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.eksClient": {
-			"name": "camel.component.aws-eks.eksClient",
-			"description": "To use a existing configured AWS EKS as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.lazyStartProducer": {
-			"name": "camel.component.aws-eks.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.operation": {
-			"name": "camel.component.aws-eks.operation",
-			"description": "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listClusters",
-				"describeCluster",
-				"createCluster",
-				"deleteCluster"
-			]
-		},
-		"camel.component.aws-eks.proxyHost": {
-			"name": "camel.component.aws-eks.proxyHost",
-			"description": "To define a proxy host when instantiating the EKS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.proxyPort": {
-			"name": "camel.component.aws-eks.proxyPort",
-			"description": "To define a proxy port when instantiating the EKS client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.proxyProtocol": {
-			"name": "camel.component.aws-eks.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-eks.region": {
-			"name": "camel.component.aws-eks.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-eks.secretKey": {
-			"name": "camel.component.aws-eks.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-eks-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index 0b609aa..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,74 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-eks-kafka-connector-sink]]
-= camel-aws-eks-kafka-connector sink configuration
-
-Connector Description: Manage AWS EKS cluster instances.
-
-When using camel-aws-eks-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-eks-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awseks.CamelAwseksSinkConnector
-----
-
-
-The camel-aws-eks sink connector supports 23 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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.eksClient* | To use a existing configured AWS EKS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
-| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
-| *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.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
-| *camel.component.aws-eks.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-eks.eksClient* | To use a existing configured AWS EKS as client | null | false | MEDIUM
-| *camel.component.aws-eks.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-eks.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
-| *camel.component.aws-eks.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
-| *camel.component.aws-eks.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-eks sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-eks sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-eks sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/docs/examples/CamelAwseksSinkConnector.properties b/connectors/camel-aws-eks-kafka-connector/src/main/docs/examples/CamelAwseksSinkConnector.properties
deleted file mode 100644
index 5b10038..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/docs/examples/CamelAwseksSinkConnector.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-eksSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awseks.CamelAwseksSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]
-camel.component.aws-eks.operation=
-# The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]
-camel.sink.endpoint.operation=
-# Logical name
-camel.sink.path.label=
-
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnector.java b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnector.java
deleted file mode 100644
index c915d76..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awseks;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwseksSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwseksSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwseksSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 7d3a77a..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awseks;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSEKS_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_AWSEKS_PATH_LABEL_DOC = "Logical name";
-    public static final String CAMEL_SINK_AWSEKS_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSEKS_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_AWSEKS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_CONF = "camel.sink.endpoint.eksClient";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_DOC = "To use a existing configured AWS EKS as client";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSEKS_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_AWSEKS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the EKS client";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the EKS client";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DEFAULT = null;
-    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_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-eks.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSEKS_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_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-eks.accessKey";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-eks.configuration";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_CONF = "camel.component.aws-eks.eksClient";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_DOC = "To use a existing configured AWS EKS as client";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-eks.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSEKS_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_AWSEKS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_CONF = "camel.component.aws-eks.operation";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-eks.proxyHost";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the EKS client";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-eks.proxyPort";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the EKS client";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-eks.proxyProtocol";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_REGION_CONF = "camel.component.aws-eks.region";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_REGION_DEFAULT = null;
-    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_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,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwseksSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSEKS_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEKS_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_EKS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEKS_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_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.PASSWORD, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_EKS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEKS_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_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-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkTask.java b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkTask.java
deleted file mode 100644
index a3c2052..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awseks;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwseksSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwseksSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-eks");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-eks-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-iam-kafka-connector/pom.xml b/connectors/camel-aws-iam-kafka-connector/pom.xml
deleted file mode 100644
index 914986f..0000000
--- a/connectors/camel-aws-iam-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-iam-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-iam</name>
-  <description>Camel Kafka Connector for aws-iam</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-iam</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-iam-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-iam-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 5fef435..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-iam-sink
\ 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
deleted file mode 100644
index d35d76a..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awsiam.CamelAwsiamSinkConnector",
-		"artifactId": "camel-aws-iam-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-iam-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Manage AWS IAM instances."
-	},
-	"properties": {
-		"camel.sink.path.label": {
-			"name": "camel.sink.path.label",
-			"description": "Logical name",
-			"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",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.iamClient": {
-			"name": "camel.sink.endpoint.iamClient",
-			"description": "To use a existing configured AWS IAM as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listAccessKeys",
-				"createUser",
-				"deleteUser",
-				"getUser",
-				"listUsers",
-				"createAccessKey",
-				"deleteAccessKey",
-				"updateAccessKey",
-				"createGroup",
-				"deleteGroup",
-				"listGroups",
-				"addUserToGroup",
-				"removeUserFromGroup"
-			]
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the IAM client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the IAM client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.autoDiscoverClient": {
-			"name": "camel.component.aws-iam.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.accessKey": {
-			"name": "camel.component.aws-iam.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.configuration": {
-			"name": "camel.component.aws-iam.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.iamClient": {
-			"name": "camel.component.aws-iam.iamClient",
-			"description": "To use a existing configured AWS IAM as client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.lazyStartProducer": {
-			"name": "camel.component.aws-iam.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.operation": {
-			"name": "camel.component.aws-iam.operation",
-			"description": "The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]",
-			"priority": "HIGH",
-			"required": "true",
-			"enum": [
-				"listAccessKeys",
-				"createUser",
-				"deleteUser",
-				"getUser",
-				"listUsers",
-				"createAccessKey",
-				"deleteAccessKey",
-				"updateAccessKey",
-				"createGroup",
-				"deleteGroup",
-				"listGroups",
-				"addUserToGroup",
-				"removeUserFromGroup"
-			]
-		},
-		"camel.component.aws-iam.proxyHost": {
-			"name": "camel.component.aws-iam.proxyHost",
-			"description": "To define a proxy host when instantiating the IAM client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.proxyPort": {
-			"name": "camel.component.aws-iam.proxyPort",
-			"description": "To define a proxy port when instantiating the IAM client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.proxyProtocol": {
-			"name": "camel.component.aws-iam.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-iam.region": {
-			"name": "camel.component.aws-iam.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-iam.secretKey": {
-			"name": "camel.component.aws-iam.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-iam-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index 0e5398a..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,74 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-iam-kafka-connector-sink]]
-= camel-aws-iam-kafka-connector sink configuration
-
-Connector Description: Manage AWS IAM instances.
-
-When using camel-aws-iam-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-iam-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awsiam.CamelAwsiamSinkConnector
-----
-
-
-The camel-aws-iam sink connector supports 23 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| 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.iamClient* | To use a existing configured AWS IAM as client | 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.operation* | The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | true | HIGH
-| *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
-| *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.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
-| *camel.component.aws-iam.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-iam.iamClient* | To use a existing configured AWS IAM as client | null | false | MEDIUM
-| *camel.component.aws-iam.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-iam.operation* | The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | true | HIGH
-| *camel.component.aws-iam.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
-| *camel.component.aws-iam.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-iam sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-iam sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-iam sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/docs/examples/CamelAwsiamSinkConnector.properties b/connectors/camel-aws-iam-kafka-connector/src/main/docs/examples/CamelAwsiamSinkConnector.properties
deleted file mode 100644
index a854aa8..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/docs/examples/CamelAwsiamSinkConnector.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-iamSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awsiam.CamelAwsiamSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]
-camel.component.aws-iam.operation=
-# The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]
-camel.sink.endpoint.operation=
-# Logical name
-camel.sink.path.label=
-
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnector.java b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnector.java
deleted file mode 100644
index e83593f..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsiam;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsiamSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwsiamSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsiamSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 43ac707..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsiam;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSIAM_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_AWSIAM_PATH_LABEL_DOC = "Logical name";
-    public static final String CAMEL_SINK_AWSIAM_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSIAM_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_AWSIAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_CONF = "camel.sink.endpoint.iamClient";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_DOC = "To use a existing configured AWS IAM as client";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSIAM_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_AWSIAM_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the IAM client";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the IAM client";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DEFAULT = null;
-    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_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-iam.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSIAM_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_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-iam.accessKey";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-iam.configuration";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_CONF = "camel.component.aws-iam.iamClient";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_DOC = "To use a existing configured AWS IAM as client";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-iam.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSIAM_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_AWSIAM_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_CONF = "camel.component.aws-iam.operation";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-iam.proxyHost";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the IAM client";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-iam.proxyPort";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the IAM client";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-iam.proxyProtocol";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_REGION_CONF = "camel.component.aws-iam.region";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_REGION_DOC = "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()";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_REGION_DEFAULT = null;
-    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_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,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwsiamSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSIAM_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSIAM_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_IAM_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSIAM_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_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.PASSWORD, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_IAM_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSIAM_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PORT_DOC);
-        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.PASSWORD, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_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-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkTask.java b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkTask.java
deleted file mode 100644
index e3e8ca4..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsiam;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsiamSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsiamSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-iam");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-iam-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml b/connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml
deleted file mode 100644
index fc9a4eb..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-kinesis-firehose-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-kinesis-firehose</name>
-  <description>Camel Kafka Connector for aws-kinesis-firehose</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-kinesis</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index e366076..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-kinesis-firehose-sink
\ 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
deleted file mode 100644
index e74a3b4..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskinesisfirehoseSinkConnector",
-		"artifactId": "camel-aws-kinesis-firehose-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-kinesis-firehose-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Consume data from AWS Kinesis Firehose streams."
-	},
-	"properties": {
-		"camel.sink.path.streamName": {
-			"name": "camel.sink.path.streamName",
-			"description": "Name of the stream",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.amazonKinesisFirehoseClient": {
-			"name": "camel.sink.endpoint.amazonKinesisFirehoseClient",
-			"description": "Amazon Kinesis Firehose client to use for all requests for this endpoint",
-			"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 [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis Firehose client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis Firehose client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.accessKey": {
-			"name": "camel.sink.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.amazonKinesisFirehoseClient": {
-			"name": "camel.component.aws-kinesis-firehose.amazonKinesisFirehoseClient",
-			"description": "Amazon Kinesis Firehose client to use for all requests for this endpoint",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.autoDiscoverClient": {
-			"name": "camel.component.aws-kinesis-firehose.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.configuration": {
-			"name": "camel.component.aws-kinesis-firehose.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.lazyStartProducer": {
-			"name": "camel.component.aws-kinesis-firehose.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.proxyHost": {
-			"name": "camel.component.aws-kinesis-firehose.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis Firehose client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.proxyPort": {
-			"name": "camel.component.aws-kinesis-firehose.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis Firehose client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.proxyProtocol": {
-			"name": "camel.component.aws-kinesis-firehose.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-kinesis-firehose.region": {
-			"name": "camel.component.aws-kinesis-firehose.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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": {
-			"name": "camel.component.aws-kinesis-firehose.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis-firehose.secretKey": {
-			"name": "camel.component.aws-kinesis-firehose.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index db953d5..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,72 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-kinesis-firehose-kafka-connector-sink]]
-= camel-aws-kinesis-firehose-kafka-connector sink configuration
-
-Connector Description: Consume data from AWS Kinesis Firehose streams.
-
-When using camel-aws-kinesis-firehose-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-kinesis-firehose-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskinesisfirehoseSinkConnector
-----
-
-
-The camel-aws-kinesis-firehose sink connector supports 21 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| Name | Description | Default | Required | Priority
-| *camel.sink.path.streamName* | Name of the stream | null | true | HIGH
-| *camel.sink.endpoint.amazonKinesisFirehoseClient* | Amazon Kinesis Firehose client to use for all requests for this endpoint | 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.proxyHost* | To define a proxy host when instantiating the Kinesis Firehose client | null | false | MEDIUM
-| *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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-kinesis-firehose.amazonKinesis FirehoseClient* | Amazon Kinesis Firehose client to use for all requests for this endpoint | null | false | MEDIUM
-| *camel.component.aws-kinesis-firehose.autoDiscover Client* | 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-kinesis-firehose.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-kinesis-firehose.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.aws-kinesis-firehose.proxyHost* | To define a proxy host when instantiating the Kinesis Firehose client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-kinesis-firehose sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-kinesis-firehose sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-kinesis-firehose sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehoseSinkConnector.properties b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehoseSinkConnector.properties
deleted file mode 100644
index ccaa939..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehoseSinkConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-kinesis-firehoseSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskinesisfirehoseSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# Name of the stream
-camel.sink.path.streamName=
-
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnector.java b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnector.java
deleted file mode 100644
index e56d61b..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesisfirehose;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisfirehoseSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwskinesisfirehoseSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesisfirehoseSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index fbf2e28..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesisfirehose;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisfirehoseSinkConnectorConfig
-        extends
-            CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_CONF = "camel.sink.path.streamName";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_DOC = "Name of the stream";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_CONF = "camel.sink.endpoint.amazonKinesisFirehoseClient";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_DOC = "Amazon Kinesis Firehose client to use for all requests for this endpoint";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_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_AWSKINESISFIREHOSE_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_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. Bew [...]
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Kinesis Firehose client";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Kinesis Firehose client";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    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_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_CONF = "camel.component.aws-kinesis-firehose.amazonKinesisFirehoseClient";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_DOC = "Amazon Kinesis Firehose client to use for all requests for this endpoint";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-kinesis-firehose.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_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_AWSKINESISFIREHOSE_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-kinesis-firehose.configuration";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-kinesis-firehose.lazyStartProducer";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_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. Be [...]
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-kinesis-firehose.proxyHost";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Kinesis Firehose client";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-kinesis-firehose.proxyPort";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Kinesis Firehose client";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-kinesis-firehose.proxyProtocol";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    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_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;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-kinesis-firehose.secretKey";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DEFAULT = null;
-
-    public CamelAwskinesisfirehoseSinkConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwskinesisfirehoseSinkConnectorConfig(
-            Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISFIREHOSE_PATH_STREAM_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AMAZON_KINESIS_FIREHOSE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_HOST_DOC);
-        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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AMAZON_KINESIS_FIREHOSE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_HOST_DOC);
-        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_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.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkTask.java b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkTask.java
deleted file mode 100644
index 10d1850..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesisfirehose;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisfirehoseSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwskinesisfirehoseSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-kinesis-firehose");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/connectors/camel-aws-kinesis-kafka-connector/pom.xml b/connectors/camel-aws-kinesis-kafka-connector/pom.xml
deleted file mode 100644
index 2d30362..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.camel.kafkaconnector</groupId>
-    <artifactId>connectors</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-aws-kinesis-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: aws-kinesis</name>
-  <description>Camel Kafka Connector for aws-kinesis</description>
-  <dependencies>
-    <!-- Kafka -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>connect-transforms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-kinesis</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <!--END OF GENERATED CODE-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${version.maven.surefire.plugin}</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${version.maven.jar}</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/package.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <!-- camel-jira -->
-    <repository>
-      <id>atlassian-public</id>
-      <url>https://packages.atlassian.com/maven-external</url>
-      <name>Atlassian Public Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <!-- camel-ipfs and camel-weka -->
-    <repository>
-      <id>jboss.thirdparty</id>
-      <name>JBoss Thirdparty Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
-</project>
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-sink.properties
deleted file mode 100644
index 9d192df..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-sink.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-kinesis-sink
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-source.properties
deleted file mode 100644
index f636eba..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/descriptors/connector-source.properties
+++ /dev/null
@@ -1 +0,0 @@
-camel-aws-kinesis-source
\ No newline at end of file
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
deleted file mode 100644
index 894363d..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkConnector",
-		"artifactId": "camel-aws-kinesis-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-kinesis-sink",
-		"type": "sink",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Consume and produce records from AWS Kinesis Streams."
-	},
-	"properties": {
-		"camel.sink.path.streamName": {
-			"name": "camel.sink.path.streamName",
-			"description": "Name of the stream",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.endpoint.amazonKinesisClient": {
-			"name": "camel.sink.endpoint.amazonKinesisClient",
-			"description": "Amazon Kinesis client to use for all requests for this endpoint",
-			"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.proxyHost": {
-			"name": "camel.sink.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyPort": {
-			"name": "camel.sink.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.proxyProtocol": {
-			"name": "camel.sink.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.sink.endpoint.region": {
-			"name": "camel.sink.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.accessKey": {
-			"name": "camel.sink.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.secretKey": {
-			"name": "camel.sink.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.amazonKinesisClient": {
-			"name": "camel.component.aws-kinesis.amazonKinesisClient",
-			"description": "Amazon Kinesis client to use for all requests for this endpoint",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.configuration": {
-			"name": "camel.component.aws-kinesis.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyHost": {
-			"name": "camel.component.aws-kinesis.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyPort": {
-			"name": "camel.component.aws-kinesis.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyProtocol": {
-			"name": "camel.component.aws-kinesis.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-kinesis.region": {
-			"name": "camel.component.aws-kinesis.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.lazyStartProducer": {
-			"name": "camel.component.aws-kinesis.lazyStartProducer",
-			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.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": {
-			"name": "camel.component.aws-kinesis.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.secretKey": {
-			"name": "camel.component.aws-kinesis.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
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
deleted file mode 100644
index e79f105..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
-	"connector": {
-		"class": "org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSourceConnector",
-		"artifactId": "camel-aws-kinesis-kafka-connector",
-		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-aws-kinesis-source",
-		"type": "source",
-		"version": "0.9.0-SNAPSHOT",
-		"description": "Consume and produce records from AWS Kinesis Streams."
-	},
-	"properties": {
-		"camel.source.path.streamName": {
-			"name": "camel.source.path.streamName",
-			"description": "Name of the stream",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.source.endpoint.amazonKinesisClient": {
-			"name": "camel.source.endpoint.amazonKinesisClient",
-			"description": "Amazon Kinesis client to use for all requests for this endpoint",
-			"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.proxyHost": {
-			"name": "camel.source.endpoint.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.proxyPort": {
-			"name": "camel.source.endpoint.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.proxyProtocol": {
-			"name": "camel.source.endpoint.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.source.endpoint.region": {
-			"name": "camel.source.endpoint.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.bridgeErrorHandler": {
-			"name": "camel.source.endpoint.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.iteratorType": {
-			"name": "camel.source.endpoint.iteratorType",
-			"description": "Defines where in the Kinesis stream to start getting records One of: [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [TRIM_HORIZON] [LATEST] [AT_TIMESTAMP]",
-			"defaultValue": "\"TRIM_HORIZON\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_TIMESTAMP"
-			]
-		},
-		"camel.source.endpoint.maxResultsPerRequest": {
-			"name": "camel.source.endpoint.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
-			"defaultValue": "1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
-			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
-			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.sequenceNumber": {
-			"name": "camel.source.endpoint.sequenceNumber",
-			"description": "The sequence number to start polling from. Required if iteratorType is set to AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.shardClosed": {
-			"name": "camel.source.endpoint.shardClosed",
-			"description": "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]",
-			"defaultValue": "\"ignore\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"ignore",
-				"fail",
-				"silent"
-			]
-		},
-		"camel.source.endpoint.shardId": {
-			"name": "camel.source.endpoint.shardId",
-			"description": "Defines which shardId in the Kinesis stream to get records from",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.exceptionHandler": {
-			"name": "camel.source.endpoint.exceptionHandler",
-			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.exchangePattern": {
-			"name": "camel.source.endpoint.exchangePattern",
-			"description": "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"InOnly",
-				"InOut",
-				"InOptionalOut"
-			]
-		},
-		"camel.source.endpoint.pollStrategy": {
-			"name": "camel.source.endpoint.pollStrategy",
-			"description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffErrorThreshold": {
-			"name": "camel.source.endpoint.backoffErrorThreshold",
-			"description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffIdleThreshold": {
-			"name": "camel.source.endpoint.backoffIdleThreshold",
-			"description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.backoffMultiplier": {
-			"name": "camel.source.endpoint.backoffMultiplier",
-			"description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and\/or backoffErrorThreshold must also be configured.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.delay": {
-			"name": "camel.source.endpoint.delay",
-			"description": "Milliseconds before the next poll.",
-			"defaultValue": "500L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.greedy": {
-			"name": "camel.source.endpoint.greedy",
-			"description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.initialDelay": {
-			"name": "camel.source.endpoint.initialDelay",
-			"description": "Milliseconds before the first poll starts.",
-			"defaultValue": "1000L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.repeatCount": {
-			"name": "camel.source.endpoint.repeatCount",
-			"description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.",
-			"defaultValue": "0L",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.runLoggingLevel": {
-			"name": "camel.source.endpoint.runLoggingLevel",
-			"description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]",
-			"defaultValue": "\"TRACE\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"TRACE",
-				"DEBUG",
-				"INFO",
-				"WARN",
-				"ERROR",
-				"OFF"
-			]
-		},
-		"camel.source.endpoint.scheduledExecutorService": {
-			"name": "camel.source.endpoint.scheduledExecutorService",
-			"description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.scheduler": {
-			"name": "camel.source.endpoint.scheduler",
-			"description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler",
-			"defaultValue": "\"none\"",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.schedulerProperties": {
-			"name": "camel.source.endpoint.schedulerProperties",
-			"description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.startScheduler": {
-			"name": "camel.source.endpoint.startScheduler",
-			"description": "Whether the scheduler should be auto started.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.timeUnit": {
-			"name": "camel.source.endpoint.timeUnit",
-			"description": "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]",
-			"defaultValue": "\"MILLISECONDS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"NANOSECONDS",
-				"MICROSECONDS",
-				"MILLISECONDS",
-				"SECONDS",
-				"MINUTES",
-				"HOURS",
-				"DAYS"
-			]
-		},
-		"camel.source.endpoint.useFixedDelay": {
-			"name": "camel.source.endpoint.useFixedDelay",
-			"description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.accessKey": {
-			"name": "camel.source.endpoint.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.secretKey": {
-			"name": "camel.source.endpoint.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.amazonKinesisClient": {
-			"name": "camel.component.aws-kinesis.amazonKinesisClient",
-			"description": "Amazon Kinesis client to use for all requests for this endpoint",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.configuration": {
-			"name": "camel.component.aws-kinesis.configuration",
-			"description": "The component configuration",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyHost": {
-			"name": "camel.component.aws-kinesis.proxyHost",
-			"description": "To define a proxy host when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyPort": {
-			"name": "camel.component.aws-kinesis.proxyPort",
-			"description": "To define a proxy port when instantiating the Kinesis client",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.proxyProtocol": {
-			"name": "camel.component.aws-kinesis.proxyProtocol",
-			"description": "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]",
-			"defaultValue": "\"HTTPS\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"HTTP",
-				"HTTPS"
-			]
-		},
-		"camel.component.aws-kinesis.region": {
-			"name": "camel.component.aws-kinesis.region",
-			"description": "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()",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.bridgeErrorHandler": {
-			"name": "camel.component.aws-kinesis.bridgeErrorHandler",
-			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.iteratorType": {
-			"name": "camel.component.aws-kinesis.iteratorType",
-			"description": "Defines where in the Kinesis stream to start getting records One of: [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [TRIM_HORIZON] [LATEST] [AT_TIMESTAMP]",
-			"defaultValue": "\"TRIM_HORIZON\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"AT_SEQUENCE_NUMBER",
-				"AFTER_SEQUENCE_NUMBER",
-				"TRIM_HORIZON",
-				"LATEST",
-				"AT_TIMESTAMP"
-			]
-		},
-		"camel.component.aws-kinesis.maxResultsPerRequest": {
-			"name": "camel.component.aws-kinesis.maxResultsPerRequest",
-			"description": "Maximum number of records that will be fetched in each poll",
-			"defaultValue": "1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.sequenceNumber": {
-			"name": "camel.component.aws-kinesis.sequenceNumber",
-			"description": "The sequence number to start polling from. Required if iteratorType is set to AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.shardClosed": {
-			"name": "camel.component.aws-kinesis.shardClosed",
-			"description": "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]",
-			"defaultValue": "\"ignore\"",
-			"priority": "MEDIUM",
-			"required": "false",
-			"enum": [
-				"ignore",
-				"fail",
-				"silent"
-			]
-		},
-		"camel.component.aws-kinesis.shardId": {
-			"name": "camel.component.aws-kinesis.shardId",
-			"description": "Defines which shardId in the Kinesis stream to get records from",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"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": {
-			"name": "camel.component.aws-kinesis.accessKey",
-			"description": "Amazon AWS Access Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.component.aws-kinesis.secretKey": {
-			"name": "camel.component.aws-kinesis.secretKey",
-			"description": "Amazon AWS Secret Key",
-			"priority": "MEDIUM",
-			"required": "false"
-		}
-	}
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-kinesis-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 05f0b1a..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly>
-  <!-- Assembles a packaged version targeting OS installation. -->
-  <id>package</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>licenses/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/docs</directory>
-      <outputDirectory>docs/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>${project.artifactId}/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.apache.kafka:connect-api</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/connectors/camel-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
deleted file mode 100644
index 8628a6f..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,72 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-kinesis-kafka-connector-sink]]
-= camel-aws-kinesis-kafka-connector sink configuration
-
-Connector Description: Consume and produce records from AWS Kinesis Streams.
-
-When using camel-aws-kinesis-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-kinesis-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Sink connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkConnector
-----
-
-
-The camel-aws-kinesis sink connector supports 21 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| Name | Description | Default | Required | Priority
-| *camel.sink.path.streamName* | Name of the stream | null | true | HIGH
-| *camel.sink.endpoint.amazonKinesisClient* | Amazon Kinesis client to use for all requests for this endpoint | 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.proxyHost* | To define a proxy host when instantiating the Kinesis client | null | false | MEDIUM
-| *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Kinesis client | null | false | MEDIUM
-| *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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-kinesis.amazonKinesisClient* | Amazon Kinesis client to use for all requests for this endpoint | null | false | MEDIUM
-| *camel.component.aws-kinesis.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-kinesis.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-kinesis.proxyHost* | To define a proxy host when instantiating the Kinesis client | null | false | MEDIUM
-| *camel.component.aws-kinesis.proxyPort* | To define a proxy port when instantiating the Kinesis client | null | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-kinesis sink connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-kinesis sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-kinesis sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
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
deleted file mode 100644
index 6a5c799..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
+++ /dev/null
@@ -1,100 +0,0 @@
-// kafka-connector options: START
-[[camel-aws-kinesis-kafka-connector-source]]
-= camel-aws-kinesis-kafka-connector source configuration
-
-Connector description: Consume and produce records from AWS Kinesis Streams.
-
-When using camel-aws-kinesis-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-aws-kinesis-kafka-connector</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-To use this Source connector in Kafka connect you'll need to set the following connector.class
-
-[source,java]
-----
-connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSourceConnector
-----
-
-
-The camel-aws-kinesis source connector supports 49 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,1,1",options="header"]
-|===
-| Name | Description | Default | Required | Priority
-| *camel.source.path.streamName* | Name of the stream | null | true | HIGH
-| *camel.source.endpoint.amazonKinesisClient* | Amazon Kinesis client to use for all requests for this endpoint | null | false | MEDIUM
-| *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.proxyHost* | To define a proxy host when instantiating the Kinesis client | null | false | MEDIUM
-| *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the Kinesis client | null | false | MEDIUM
-| *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
-| *camel.source.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.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 Kinesis stream to start getting records One of: [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [TRIM_HORIZON] [LATEST] [AT_TIMESTAMP] | "TRIM_HORIZON" | false | MEDIUM
-| *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | 1 | false | MEDIUM
-| *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
-| *camel.source.endpoint.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.source.endpoint.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.source.endpoint.shardId* | Defines which shardId in the Kinesis stream to get records from | null | false | MEDIUM
-| *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
-| *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.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
-| *camel.source.endpoint.backoffMultiplier* | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | null | false | MEDIUM
-| *camel.source.endpoint.delay* | Milliseconds before the next poll. | 500L | false | MEDIUM
-| *camel.source.endpoint.greedy* | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | false | MEDIUM
-| *camel.source.endpoint.initialDelay* | Milliseconds before the first poll starts. | 1000L | false | MEDIUM
-| *camel.source.endpoint.repeatCount* | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0L | false | MEDIUM
-| *camel.source.endpoint.runLoggingLevel* | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF] | "TRACE" | false | MEDIUM
-| *camel.source.endpoint.scheduledExecutorService* | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | null | false | MEDIUM
-| *camel.source.endpoint.scheduler* | To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler | "none" | false | MEDIUM
-| *camel.source.endpoint.schedulerProperties* | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | null | false | MEDIUM
-| *camel.source.endpoint.startScheduler* | Whether the scheduler should be auto started. | true | false | MEDIUM
-| *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.source.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
-| *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-kinesis.amazonKinesisClient* | Amazon Kinesis client to use for all requests for this endpoint | null | false | MEDIUM
-| *camel.component.aws-kinesis.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-kinesis.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.aws-kinesis.proxyHost* | To define a proxy host when instantiating the Kinesis client | null | false | MEDIUM
-| *camel.component.aws-kinesis.proxyPort* | To define a proxy port when instantiating the Kinesis client | null | false | MEDIUM
-| *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.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.aws-kinesis.iteratorType* | Defines where in the Kinesis stream to start getting records One of: [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [TRIM_HORIZON] [LATEST] [AT_TIMESTAMP] | "TRIM_HORIZON" | false | MEDIUM
-| *camel.component.aws-kinesis.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | 1 | false | MEDIUM
-| *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.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
-|===
-
-
-
-The camel-aws-kinesis source connector has no converters out of the box.
-
-
-
-
-
-The camel-aws-kinesis source connector has no transforms out of the box.
-
-
-
-
-
-The camel-aws-kinesis source connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSinkConnector.properties b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSinkConnector.properties
deleted file mode 100644
index 5b4d79f..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSinkConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-kinesisSinkConnector
-connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to get messages from
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# Name of the stream
-camel.sink.path.streamName=
-
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSourceConnector.properties b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSourceConnector.properties
deleted file mode 100644
index 2bf6576..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/examples/CamelAwskinesisSourceConnector.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-name=CamelAws-kinesisSourceConnector
-connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSourceConnector
-tasks.max=1
-
-# use the kafka converters that better suit your needs, these are just defaults:
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
-
-# comma separated topics to send messages into
-topics=
-
-# mandatory properties (for a complete properties list see the connector documentation):
-
-# Name of the stream
-camel.source.path.streamName=
-
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnector.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnector.java
deleted file mode 100644
index d795f4f..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesis;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwskinesisSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesisSinkTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index c5f8abb..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesis;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisSinkConnectorConfig
-        extends
-            CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_CONF = "camel.sink.path.streamName";
-    public static final String CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_DOC = "Name of the stream";
-    public static final String CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_CONF = "camel.sink.endpoint.amazonKinesisClient";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DOC = "Amazon Kinesis client to use for all requests for this endpoint";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSKINESIS_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_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Kinesis client";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_CONF = "camel.sink.endpoint.proxyPort";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Kinesis client";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.sink.endpoint.proxyProtocol";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
-    public static final String CAMEL_SINK_AWSKINESIS_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_AWSKINESIS_ENDPOINT_REGION_DEFAULT = null;
-    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_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_CONF = "camel.component.aws-kinesis.amazonKinesisClient";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_DOC = "Amazon Kinesis client to use for all requests for this endpoint";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws-kinesis.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWSKINESIS_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_AWSKINESIS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws-kinesis.configuration";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_DOC = "The component configuration";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-kinesis.proxyHost";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Kinesis client";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_CONF = "camel.component.aws-kinesis.proxyPort";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Kinesis client";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_CONF = "camel.component.aws-kinesis.proxyProtocol";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_CONF = "camel.component.aws-kinesis.region";
-    public static final String CAMEL_SINK_AWSKINESIS_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_AWSKINESIS_COMPONENT_REGION_DEFAULT = null;
-    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_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;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-kinesis.secretKey";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT = null;
-
-    public CamelAwskinesisSinkConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelAwskinesisSinkConnectorConfig(Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESIS_PATH_STREAM_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PORT_DOC);
-        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_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_HOST_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PORT_DOC);
-        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_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.PASSWORD, 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.PASSWORD, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkTask.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkTask.java
deleted file mode 100644
index 9ca349d..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesis;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwskinesisSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws-kinesis");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnector.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnector.java
deleted file mode 100644
index 537b094..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesis;
-
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnector;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisSourceConnector extends CamelSourceConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelAwskinesisSourceConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesisSourceTask.class;
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 0300fd9..0000000
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesis;
-
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.kafka.common.config.ConfigDef;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisSourceConnectorConfig
-        extends
-            CamelSourceConnectorConfig {
-
-    public static final String CAMEL_SOURCE_AWSKINESIS_PATH_STREAM_NAME_CONF = "camel.source.path.streamName";
-    public static final String CAMEL_SOURCE_AWSKINESIS_PATH_STREAM_NAME_DOC = "Name of the stream";
-    public static final String CAMEL_SOURCE_AWSKINESIS_PATH_STREAM_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_CONF = "camel.source.endpoint.amazonKinesisClient";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DOC = "Amazon Kinesis client to use for all requests for this endpoint";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_AMAZON_KINESIS_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.source.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SOURCE_AWSKINESIS_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_SOURCE_AWSKINESIS_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_HOST_CONF = "camel.source.endpoint.proxyHost";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Kinesis client";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_HOST_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PORT_CONF = "camel.source.endpoint.proxyPort";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PORT_DOC = "To define a proxy port when instantiating the Kinesis client";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PORT_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_CONF = "camel.source.endpoint.proxyProtocol";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DOC = "To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS]";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DEFAULT = "HTTPS";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_REGION_CONF = "camel.source.endpoint.region";
-    public static final String CAMEL_SOURCE_AWSKINESIS_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_SOURCE_AWSKINESIS_ENDPOINT_REGION_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and  [...]
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ITERATOR_TYPE_CONF = "camel.source.endpoint.iteratorType";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ITERATOR_TYPE_DOC = "Defines where in the Kinesis stream to start getting records One of: [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [TRIM_HORIZON] [LATEST] [AT_TIMESTAMP]";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ITERATOR_TYPE_DEFAULT = "TRIM_HORIZON";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF = "camel.source.endpoint.maxResultsPerRequest";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
-    public static final Integer CAMEL_SOURCE_AWSKINESIS_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT = 1;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF = "camel.source.endpoint.sendEmptyMessageWhenIdle";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEQUENCE_NUMBER_CONF = "camel.source.endpoint.sequenceNumber";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEQUENCE_NUMBER_DOC = "The sequence number to start polling from. Required if iteratorType is set to AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SEQUENCE_NUMBER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_CLOSED_CONF = "camel.source.endpoint.shardClosed";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_CLOSED_DOC = "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]";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_CLOSED_DEFAULT = "ignore";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_ID_CONF = "camel.source.endpoint.shardId";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_ID_DOC = "Defines which shardId in the Kinesis stream to get records from";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SHARD_ID_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
-    public static final String CAMEL_SOURCE_AWSKINESIS_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_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    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_BACKOFF_ERROR_THRESHOLD_CONF = "camel.source.endpoint.backoffErrorThreshold";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC = "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.";
-    public static final Integer CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF = "camel.source.endpoint.backoffIdleThreshold";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC = "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.";
-    public static final Integer CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_MULTIPLIER_CONF = "camel.source.endpoint.backoffMultiplier";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_MULTIPLIER_DOC = "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.";
-    public static final Integer CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_MULTIPLIER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_DELAY_CONF = "camel.source.endpoint.delay";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_DELAY_DOC = "Milliseconds before the next poll.";
-    public static final Long CAMEL_SOURCE_AWSKINESIS_ENDPOINT_DELAY_DEFAULT = 500L;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_GREEDY_CONF = "camel.source.endpoint.greedy";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_GREEDY_DOC = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_GREEDY_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_INITIAL_DELAY_CONF = "camel.source.endpoint.initialDelay";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_INITIAL_DELAY_DOC = "Milliseconds before the first poll starts.";
-    public static final Long CAMEL_SOURCE_AWSKINESIS_ENDPOINT_INITIAL_DELAY_DEFAULT = 1000L;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_REPEAT_COUNT_CONF = "camel.source.endpoint.repeatCount";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_REPEAT_COUNT_DOC = "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.";
-    public static final Long CAMEL_SOURCE_AWSKINESIS_ENDPOINT_REPEAT_COUNT_DEFAULT = 0L;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_RUN_LOGGING_LEVEL_CONF = "camel.source.endpoint.runLoggingLevel";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_RUN_LOGGING_LEVEL_DOC = "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_RUN_LOGGING_LEVEL_DEFAULT = "TRACE";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_CONF = "camel.source.endpoint.scheduledExecutorService";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DOC = "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULED_EXECUTOR_SERVICE_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_CONF = "camel.source.endpoint.scheduler";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_DOC = "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_DEFAULT = "none";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_PROPERTIES_CONF = "camel.source.endpoint.schedulerProperties";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_PROPERTIES_DOC = "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SCHEDULER_PROPERTIES_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_START_SCHEDULER_CONF = "camel.source.endpoint.startScheduler";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_START_SCHEDULER_DOC = "Whether the scheduler should be auto started.";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_START_SCHEDULER_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_TIME_UNIT_CONF = "camel.source.endpoint.timeUnit";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_TIME_UNIT_DOC = "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_TIME_UNIT_DEFAULT = "MILLISECONDS";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_USE_FIXED_DELAY_CONF = "camel.source.endpoint.useFixedDelay";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_USE_FIXED_DELAY_DOC = "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_USE_FIXED_DELAY_DEFAULT = true;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ACCESS_KEY_CONF = "camel.source.endpoint.accessKey";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SECRET_KEY_CONF = "camel.source.endpoint.secretKey";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_AMAZON_KINESIS_CLIENT_CONF = "camel.component.aws-kinesis.amazonKinesisClient";
... 19174 lines suppressed ...