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

[camel-kafka-connector] branch camel-master updated: Poor mans Regen and rebase on master

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

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


The following commit(s) were added to refs/heads/camel-master by this push:
     new 68e299d  Poor mans Regen and rebase on master
68e299d is described below

commit 68e299ddab01e920f9099e8677ec829812b257f6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Sep 25 08:00:27 2020 +0200

    Poor mans Regen and rebase on master
---
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |  10 +-
 .../CamelAws2eventbridgeSinkConnector.properties   |   8 +-
 .../CamelAws2eventbridgeSinkConnectorConfig.java   |  20 +-
 .../camel-bean-validator-kafka-connector/pom.xml   | 135 --------------
 .../src/main/assembly/package.xml                  |  57 ------
 .../camel-bean-validator-kafka-sink-connector.adoc |  68 -------
 .../CamelBeanvalidatorSinkConnector.properties     |  33 ----
 .../CamelBeanvalidatorSinkConnector.java           |  35 ----
 .../CamelBeanvalidatorSinkConnectorConfig.java     | 121 ------------
 .../beanvalidator/CamelBeanvalidatorSinkTask.java  |  39 ----
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ---------------------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 --
 connectors/pom.xml                                 |   2 +-
 docs/modules/ROOT/pages/connectors.adoc            |   3 +-
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |  10 +-
 .../camel-bean-validator-kafka-sink-connector.adoc |  68 -------
 16 files changed, 20 insertions(+), 803 deletions(-)

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 b593cf1..6fc00b8 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
@@ -22,20 +22,19 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 33 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Priority
-| *camel.sink.path.label* | Logical name | null | HIGH
+| *camel.sink.path.eventbusNameOrArn* | Event bus name or ARN | null | 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 | MEDIUM
 | *camel.sink.endpoint.eventbridgeClient* | To use a existing configured AWS Eventbridge as client | null | MEDIUM
-| *camel.sink.endpoint.eventbusName* | The eventbus name, the default value is default and this means it will be the AWS event bus of your account. | "default" | MEDIUM
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | null | 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] | "putRule" | HIGH
+| *camel.sink.endpoint.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules] | "putRule" | HIGH
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | MEDIUM
@@ -49,10 +48,9 @@ The camel-aws2-eventbridge sink connector supports 33 options, which are listed
 | *camel.component.aws2-eventbridge.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 | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | MEDIUM
 | *camel.component.aws2-eventbridge.eventbridgeClient* | To use a existing configured AWS Eventbridge as client | null | MEDIUM
-| *camel.component.aws2-eventbridge.eventbusName* | The eventbus name, the default value is default and this means it will be the AWS event bus of your account. | "default" | MEDIUM
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | 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] | "putRule" | HIGH
+| *camel.component.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules] | "putRule" | HIGH
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | MEDIUM
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/examples/CamelAws2eventbridgeSinkConnector.properties b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/examples/CamelAws2eventbridgeSinkConnector.properties
index c3bda11..7bf4bd6 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/examples/CamelAws2eventbridgeSinkConnector.properties
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/examples/CamelAws2eventbridgeSinkConnector.properties
@@ -28,10 +28,10 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The operation to perform One of: [putRule] [putTargets] [removeTargets]
+# The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules]
 camel.component.aws2-eventbridge.operation=
-# The operation to perform One of: [putRule] [putTargets] [removeTargets]
+# The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules]
 camel.sink.endpoint.operation=
-# Logical name
-camel.sink.path.label=
+# Event bus name or ARN
+camel.sink.path.eventbusNameOrArn=
 
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 dc33c89..763f6df 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
@@ -26,18 +26,15 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         extends
             CamelSinkConnectorConfig {
 
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_DOC = "Logical name";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_CONF = "camel.sink.path.eventbusNameOrArn";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_DOC = "Event bus name or ARN";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_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_AWS2EVENTBRIDGE_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_CONF = "camel.sink.endpoint.eventbridgeClient";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_DOC = "To use a existing configured AWS Eventbridge as client";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_CONF = "camel.sink.endpoint.eventbusName";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_DOC = "The eventbus name, the default value is default and this means it will be the AWS event bus of your account.";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_DEFAULT = "default";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_CONF = "camel.sink.endpoint.eventPatternFile";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DOC = "EventPattern File";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DEFAULT = null;
@@ -45,7 +42,7 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_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_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
     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]";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DEFAULT = "putRule";
     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";
@@ -86,9 +83,6 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_CONF = "camel.component.aws2-eventbridge.eventbridgeClient";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_DOC = "To use a existing configured AWS Eventbridge as client";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_CONF = "camel.component.aws2-eventbridge.eventbusName";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_DOC = "The eventbus name, the default value is default and this means it will be the AWS event bus of your account.";
-    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_DEFAULT = "default";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_CONF = "camel.component.aws2-eventbridge.eventPatternFile";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DOC = "EventPattern File";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DEFAULT = null;
@@ -96,7 +90,7 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_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_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
     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]";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DEFAULT = "putRule";
     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";
@@ -139,10 +133,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
 
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_PATH_LABEL_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_PATH_EVENTBUS_NAME_OR_ARN_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBRIDGE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENTBUS_NAME_DOC);
         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);
@@ -159,7 +152,6 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTO_DISCOVER_CLIENT_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);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBRIDGE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENTBUS_NAME_DOC);
         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);
diff --git a/connectors/camel-bean-validator-kafka-connector/pom.xml b/connectors/camel-bean-validator-kafka-connector/pom.xml
deleted file mode 100644
index 58f9810..0000000
--- a/connectors/camel-bean-validator-kafka-connector/pom.xml
+++ /dev/null
@@ -1,135 +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.6.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>camel-bean-validator-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: bean-validator</name>
-  <description>Camel Kafka Connector for bean-validator</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-bean-validator</artifactId>
-    </dependency>
-    <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</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-bean-validator-kafka-connector/src/main/assembly/package.xml b/connectors/camel-bean-validator-kafka-connector/src/main/assembly/package.xml
deleted file mode 100644
index 4fd2529..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/assembly/package.xml
+++ /dev/null
@@ -1,57 +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>zip</format>
-    <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-bean-validator-kafka-connector/src/main/docs/camel-bean-validator-kafka-sink-connector.adoc b/connectors/camel-bean-validator-kafka-connector/src/main/docs/camel-bean-validator-kafka-sink-connector.adoc
deleted file mode 100644
index 4c16480..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/docs/camel-bean-validator-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,68 +0,0 @@
-// kafka-connector options: START
-[[camel-bean-validator-kafka-connector-sink]]
-= camel-bean-validator-kafka-connector sink configuration
-
-When using camel-bean-validator-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-bean-validator-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.beanvalidator.CamelBeanvalidatorSinkConnector
-----
-
-
-The camel-bean-validator sink connector supports 19 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Priority
-| *camel.sink.path.label* | Where label is an arbitrary text value describing the endpoint | null | HIGH
-| *camel.sink.endpoint.group* | To use a custom validation group | "javax.validation.groups.Default" | MEDIUM
-| *camel.sink.endpoint.ignoreXmlConfiguration* | Whether to ignore data from the META-INF/validation.xml file. | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | MEDIUM
-| *camel.sink.endpoint.constraintValidatorFactory* | To use a custom ConstraintValidatorFactory | null | MEDIUM
-| *camel.sink.endpoint.messageInterpolator* | To use a custom MessageInterpolator | null | MEDIUM
-| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | MEDIUM
-| *camel.sink.endpoint.traversableResolver* | To use a custom TraversableResolver | null | MEDIUM
-| *camel.sink.endpoint.validationProviderResolver* | To use a a custom ValidationProviderResolver | null | MEDIUM
-| *camel.sink.endpoint.validatorFactory* | To use a custom ValidatorFactory | null | MEDIUM
-| *camel.component.bean-validator.ignoreXml Configuration* | Whether to ignore data from the META-INF/validation.xml file. | false | MEDIUM
-| *camel.component.bean-validator.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.bean-validator.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | LOW
-| *camel.component.bean-validator.constraintValidator Factory* | To use a custom ConstraintValidatorFactory | null | MEDIUM
-| *camel.component.bean-validator.messageInterpolator* | To use a custom MessageInterpolator | null | MEDIUM
-| *camel.component.bean-validator.traversableResolver* | To use a custom TraversableResolver | null | MEDIUM
-| *camel.component.bean-validator.validationProvider Resolver* | To use a a custom ValidationProviderResolver | null | MEDIUM
-| *camel.component.bean-validator.validatorFactory* | To use a custom ValidatorFactory | null | MEDIUM
-|===
-
-
-
-The camel-bean-validator sink connector has no converters out of the box.
-
-
-
-
-
-The camel-bean-validator sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-bean-validator sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END
diff --git a/connectors/camel-bean-validator-kafka-connector/src/main/docs/examples/CamelBeanvalidatorSinkConnector.properties b/connectors/camel-bean-validator-kafka-connector/src/main/docs/examples/CamelBeanvalidatorSinkConnector.properties
deleted file mode 100644
index 6123651..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/docs/examples/CamelBeanvalidatorSinkConnector.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=CamelBean-validatorSinkConnector
-connector.class=org.apache.camel.kafkaconnector.beanvalidator.CamelBeanvalidatorSinkConnector
-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):
-
-# Where label is an arbitrary text value describing the endpoint
-camel.sink.path.label=
-
diff --git a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnector.java b/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnector.java
deleted file mode 100644
index aff084f..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnector.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.beanvalidator;
-
-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 CamelBeanvalidatorSinkConnector extends CamelSinkConnector {
-
-    @Override
-    public ConfigDef config() {
-        return CamelBeanvalidatorSinkConnectorConfig.conf();
-    }
-    @Override
-    public Class<? extends Task> taskClass() {
-        return CamelBeanvalidatorSinkTask.class;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnectorConfig.java b/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnectorConfig.java
deleted file mode 100644
index 566ea2b..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkConnectorConfig.java
+++ /dev/null
@@ -1,121 +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.beanvalidator;
-
-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 CamelBeanvalidatorSinkConnectorConfig
-        extends
-            CamelSinkConnectorConfig {
-
-    public static final String CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_CONF = "camel.sink.path.label";
-    public static final String CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_DOC = "Where label is an arbitrary text value describing the endpoint";
-    public static final String CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_CONF = "camel.sink.endpoint.group";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_DOC = "To use a custom validation group";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_DEFAULT = "javax.validation.groups.Default";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_CONF = "camel.sink.endpoint.ignoreXmlConfiguration";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_DOC = "Whether to ignore data from the META-INF/validation.xml file.";
-    public static final Boolean CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_BEANVALIDATOR_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_BEANVALIDATOR_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_CONF = "camel.sink.endpoint.constraintValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_DOC = "To use a custom ConstraintValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_CONF = "camel.sink.endpoint.messageInterpolator";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_DOC = "To use a custom MessageInterpolator";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
-    public static final Boolean CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_CONF = "camel.sink.endpoint.traversableResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_DOC = "To use a custom TraversableResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_CONF = "camel.sink.endpoint.validationProviderResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_DOC = "To use a a custom ValidationProviderResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_CONF = "camel.sink.endpoint.validatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_DOC = "To use a custom ValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_CONF = "camel.component.bean-validator.ignoreXmlConfiguration";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_DOC = "Whether to ignore data from the META-INF/validation.xml file.";
-    public static final Boolean CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.bean-validator.lazyStartProducer";
-    public static final String CAMEL_SINK_BEANVALIDATOR_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_BEANVALIDATOR_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.bean-validator.basicPropertyBinding";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_CONF = "camel.component.bean-validator.constraintValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_DOC = "To use a custom ConstraintValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_CONF = "camel.component.bean-validator.messageInterpolator";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_DOC = "To use a custom MessageInterpolator";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_CONF = "camel.component.bean-validator.traversableResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_DOC = "To use a custom TraversableResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_CONF = "camel.component.bean-validator.validationProviderResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_DOC = "To use a a custom ValidationProviderResolver";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_DEFAULT = null;
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_CONF = "camel.component.bean-validator.validatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_DOC = "To use a custom ValidatorFactory";
-    public static final String CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_DEFAULT = null;
-
-    public CamelBeanvalidatorSinkConnectorConfig(
-            ConfigDef config,
-            Map<String, String> parsedConfig) {
-        super(config, parsedConfig);
-    }
-
-    public CamelBeanvalidatorSinkConnectorConfig(
-            Map<String, String> parsedConfig) {
-        this(conf(), parsedConfig);
-    }
-
-    public static ConfigDef conf() {
-        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_BEANVALIDATOR_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_GROUP_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_IGNORE_XML_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_CONSTRAINT_VALIDATOR_FACTORY_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_MESSAGE_INTERPOLATOR_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_SYNCHRONOUS_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_TRAVERSABLE_RESOLVER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATION_PROVIDER_RESOLVER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_ENDPOINT_VALIDATOR_FACTORY_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_IGNORE_XML_CONFIGURATION_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_BEANVALIDATOR_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_CONSTRAINT_VALIDATOR_FACTORY_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_MESSAGE_INTERPOLATOR_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_TRAVERSABLE_RESOLVER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATION_PROVIDER_RESOLVER_DOC);
-        conf.define(CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_BEANVALIDATOR_COMPONENT_VALIDATOR_FACTORY_DOC);
-        return conf;
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkTask.java b/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkTask.java
deleted file mode 100644
index 39d3eb1..0000000
--- a/connectors/camel-bean-validator-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/beanvalidator/CamelBeanvalidatorSinkTask.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.beanvalidator;
-
-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 CamelBeanvalidatorSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelBeanvalidatorSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "bean-validator");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-bean-validator-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-bean-validator-kafka-connector/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/connectors/camel-bean-validator-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-bean-validator-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-bean-validator-kafka-connector/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/connectors/camel-bean-validator-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/pom.xml b/connectors/pom.xml
index fae2a3f..b6fca48 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -116,6 +116,7 @@
                         <param>aws2-kms</param>
                         <param>aws2-mq</param>
                         <param>aws2-msk</param>
+                        <param>bean-validator</param>
                         <param>browse</param>
                         <param>class</param>                       
                         <param>dataset</param>
@@ -234,7 +235,6 @@
         <module>camel-azure-storage-blob-kafka-connector</module>
         <module>camel-azure-storage-queue-kafka-connector</module>
         <module>camel-bean-kafka-connector</module>
-        <module>camel-bean-validator-kafka-connector</module>
         <module>camel-beanstalk-kafka-connector</module>
         <module>camel-box-kafka-connector</module>
         <module>camel-braintree-kafka-connector</module>
diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc
index 86e561d..ceadc75 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: 334 
+Number of Camel Kafka connectors: 333 
 
 [width="100%",cols="4,1,1,1,1,1,1",options="header"]
 |===
@@ -59,7 +59,6 @@ Number of Camel Kafka connectors: 334
 | *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.5.0/camel-azure-storage-blob-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-a [...]
 | *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.5.0/camel-azure-storage-queue-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/ca [...]
 | *camel-bean-kafka-connector* | true | false | xref:connectors/camel-bean-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-bean-kafka-connector/0.5.0/camel-bean-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-bean-kafka-connector/0.5.0/camel-bean-kafka-connector-0.5.0-package.tar.gz[Download Tar.gz]
-| *camel-bean-validator-kafka-connector* | true | false | xref:connectors/camel-bean-validator-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-bean-validator-kafka-connector/0.5.0/camel-bean-validator-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-bean-validator-kafka-connector/0.5.0/camel-bean-validator-kafka-connector-0.5.0-package.tar.gz[Do [...]
 | *camel-beanstalk-kafka-connector* | true | true | xref:connectors/camel-beanstalk-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-beanstalk-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-beanstalk-kafka-connector/0.5.0/camel-beanstalk-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-beanstalk-kafka-connector/0.5.0/camel-beanstal [...]
 | *camel-box-kafka-connector* | true | true | xref:connectors/camel-box-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-box-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-box-kafka-connector/0.5.0/camel-box-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-box-kafka-connector/0.5.0/camel-box-kafka-connector-0.5.0-package.tar.gz[Dow [...]
 | *camel-braintree-kafka-connector* | true | true | xref:connectors/camel-braintree-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-braintree-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-braintree-kafka-connector/0.5.0/camel-braintree-kafka-connector-0.5.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-braintree-kafka-connector/0.5.0/camel-braintre [...]
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 b593cf1..6fc00b8 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
@@ -22,20 +22,19 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 33 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Priority
-| *camel.sink.path.label* | Logical name | null | HIGH
+| *camel.sink.path.eventbusNameOrArn* | Event bus name or ARN | null | 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 | MEDIUM
 | *camel.sink.endpoint.eventbridgeClient* | To use a existing configured AWS Eventbridge as client | null | MEDIUM
-| *camel.sink.endpoint.eventbusName* | The eventbus name, the default value is default and this means it will be the AWS event bus of your account. | "default" | MEDIUM
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | null | 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] | "putRule" | HIGH
+| *camel.sink.endpoint.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules] | "putRule" | HIGH
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | MEDIUM
@@ -49,10 +48,9 @@ The camel-aws2-eventbridge sink connector supports 33 options, which are listed
 | *camel.component.aws2-eventbridge.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 | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | MEDIUM
 | *camel.component.aws2-eventbridge.eventbridgeClient* | To use a existing configured AWS Eventbridge as client | null | MEDIUM
-| *camel.component.aws2-eventbridge.eventbusName* | The eventbus name, the default value is default and this means it will be the AWS event bus of your account. | "default" | MEDIUM
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | 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] | "putRule" | HIGH
+| *camel.component.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [listRules] | "putRule" | HIGH
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-bean-validator-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-bean-validator-kafka-sink-connector.adoc
deleted file mode 100644
index 4c16480..0000000
--- a/docs/modules/ROOT/pages/connectors/camel-bean-validator-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,68 +0,0 @@
-// kafka-connector options: START
-[[camel-bean-validator-kafka-connector-sink]]
-= camel-bean-validator-kafka-connector sink configuration
-
-When using camel-bean-validator-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-bean-validator-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.beanvalidator.CamelBeanvalidatorSinkConnector
-----
-
-
-The camel-bean-validator sink connector supports 19 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Priority
-| *camel.sink.path.label* | Where label is an arbitrary text value describing the endpoint | null | HIGH
-| *camel.sink.endpoint.group* | To use a custom validation group | "javax.validation.groups.Default" | MEDIUM
-| *camel.sink.endpoint.ignoreXmlConfiguration* | Whether to ignore data from the META-INF/validation.xml file. | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | MEDIUM
-| *camel.sink.endpoint.constraintValidatorFactory* | To use a custom ConstraintValidatorFactory | null | MEDIUM
-| *camel.sink.endpoint.messageInterpolator* | To use a custom MessageInterpolator | null | MEDIUM
-| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | MEDIUM
-| *camel.sink.endpoint.traversableResolver* | To use a custom TraversableResolver | null | MEDIUM
-| *camel.sink.endpoint.validationProviderResolver* | To use a a custom ValidationProviderResolver | null | MEDIUM
-| *camel.sink.endpoint.validatorFactory* | To use a custom ValidatorFactory | null | MEDIUM
-| *camel.component.bean-validator.ignoreXml Configuration* | Whether to ignore data from the META-INF/validation.xml file. | false | MEDIUM
-| *camel.component.bean-validator.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.bean-validator.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | LOW
-| *camel.component.bean-validator.constraintValidator Factory* | To use a custom ConstraintValidatorFactory | null | MEDIUM
-| *camel.component.bean-validator.messageInterpolator* | To use a custom MessageInterpolator | null | MEDIUM
-| *camel.component.bean-validator.traversableResolver* | To use a custom TraversableResolver | null | MEDIUM
-| *camel.component.bean-validator.validationProvider Resolver* | To use a a custom ValidationProviderResolver | null | MEDIUM
-| *camel.component.bean-validator.validatorFactory* | To use a custom ValidatorFactory | null | MEDIUM
-|===
-
-
-
-The camel-bean-validator sink connector has no converters out of the box.
-
-
-
-
-
-The camel-bean-validator sink connector has no transforms out of the box.
-
-
-
-
-
-The camel-bean-validator sink connector has no aggregation strategies out of the box.
-// kafka-connector options: END