You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/03/03 06:32:18 UTC

[camel] 02/18: Full regen

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7e76efe231151fd0de1a45842d07cdccb8a121d4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 15:13:09 2020 +0100

    Full regen
---
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/dummy-component.json   |   12 -
 ...urer.java => XmlSignerComponentConfigurer.java} |    6 +-
 .../org/apache/camel/component/xmlsecurity-sign    |    2 +-
 .../camel/configurer/xmlsecurity-sign-component    |    2 +-
 .../component/xmlsecurity/xmlsecurity-sign.json    |    2 +-
 ...atureComponent.java => XmlSignerComponent.java} |  132 +-
 .../component/xmlsecurity/XmlSignerEndpoint.java   |    2 +-
 core/camel-allcomponents/pom.xml                   |    4 +
 .../services/org/apache/camel/language.properties  |    4 +-
 .../apache/camel/language/constant/constant.json   |    2 +-
 .../org/apache/camel/language/header/header.json   |    2 +-
 .../camel/language/property/exchangeProperty.json  |    2 +-
 .../org/apache/camel/language/ref/ref.json         |    2 +-
 .../org/apache/camel/language/simple/file.json     |    2 +-
 .../org/apache/camel/language/simple/simple.json   |    2 +-
 .../apache/camel/language/tokenizer/tokenize.json  |    2 +-
 .../XmlsecuritySignComponentBuilderFactory.java    |   70 +-
 .../src/generated/resources/metadata.json          |    2 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   18 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |   18 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   50 +-
 ...ory.java => AWS2EC2EndpointBuilderFactory.java} |  119 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   38 -
 .../dsl/AsteriskEndpointBuilderFactory.java        |    4 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |    4 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |    9 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |  559 ++---
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |   12 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |   42 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |   28 +-
 .../dsl/ControlBusEndpointBuilderFactory.java      |   12 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |  227 ++
 .../dsl/CryptoCmsEndpointBuilderFactory.java       |    4 +-
 ...Factory.java => Cw2EndpointBuilderFactory.java} |  233 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |   22 +-
 .../dsl/DataSetEndpointBuilderFactory.java         |  120 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |  128 +-
 ...actory.java => Ddb2EndpointBuilderFactory.java} |  273 ++-
 ....java => Ddb2StreamEndpointBuilderFactory.java} |  499 ++--
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |    9 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |   11 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |   12 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |   12 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   81 +
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   12 +-
 .../endpoint/dsl/EC2EndpointBuilderFactory.java    |    8 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |   24 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |   30 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |   46 +
 .../dsl/ElytronEndpointBuilderFactory.java         |   90 +-
 ...ry.java => EtcdKeysEndpointBuilderFactory.java} |  257 +--
 ...y.java => EtcdStatsEndpointBuilderFactory.java} |  274 ++-
 ...y.java => EtcdWatchEndpointBuilderFactory.java} |  268 ++-
 .../dsl/FacebookEndpointBuilderFactory.java        |   16 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |   96 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   |   62 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |   50 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   40 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   37 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  |  228 +-
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |  228 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |  190 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |  171 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |  196 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   12 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |   12 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |    6 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |    9 +-
 ...actory.java => IAM2EndpointBuilderFactory.java} |  159 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   34 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   14 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   12 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |    6 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |   11 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |    9 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |    9 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |    4 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   54 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |  166 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   75 +
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |    4 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |   32 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |   40 +-
 ...ry.java => Kinesis2EndpointBuilderFactory.java} |  927 ++++----
 ...=> KinesisFirehose2EndpointBuilderFactory.java} |  209 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |   16 +-
 ...ory.java => Lambda2EndpointBuilderFactory.java} |  252 +-
 .../dsl/LanguageEndpointBuilderFactory.java        |   20 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |    8 +-
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |   12 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |   26 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   95 +
 .../MicroProfileMetricsEndpointBuilderFactory.java |   36 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |   17 +-
 .../endpoint/dsl/MockEndpointBuilderFactory.java   |  175 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   24 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |    4 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |   12 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java       |   12 +-
 .../endpoint/dsl/NsqEndpointBuilderFactory.java    |   34 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |  504 ++--
 .../dsl/Olingo4EndpointBuilderFactory.java         |  504 ++--
 .../dsl/PgEventEndpointBuilderFactory.java         |    9 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |   16 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   20 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |  155 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |    5 +-
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |    5 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |   12 +-
 .../dsl/SchedulerEndpointBuilderFactory.java       |   13 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |   24 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |   42 +-
 .../dsl/ServletEndpointBuilderFactory.java         |    4 +-
 ...actory.java => Ses2EndpointBuilderFactory.java} |  259 +--
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |  176 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |   64 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |   62 +-
 ...actory.java => Sns2EndpointBuilderFactory.java} |  300 ++-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |  387 +---
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |   34 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   | 2420 ++++++++++++++++++++
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |   29 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |   12 +-
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |   13 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |   35 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |   44 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   88 +-
 .../dsl/ValidatorEndpointBuilderFactory.java       |   28 +-
 .../dsl/WebhookEndpointBuilderFactory.java         |   92 +-
 .../dsl/WebsocketEndpointBuilderFactory.java       |    9 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |    4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |  508 +---
 ...y.java => XmlSignerEndpointBuilderFactory.java} |  852 +++----
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  673 ++++++
 .../endpoint/dsl/YammerEndpointBuilderFactory.java |   72 +
 .../camel-main-configuration-metadata.json         |    3 +-
 .../services/org/apache/camel/language.properties  |    7 -
 .../camel/converter/jaxp/DomConverterLoader.java   |   53 -
 .../camel/converter/jaxp/StaxConverterLoader.java  |   77 -
 .../jaxp/StreamSourceConverterLoader.java          |   38 -
 .../camel/converter/jaxp/XmlConverterLoader.java   |  159 --
 .../camel/language/xtokenizer/xtokenize.json       |   25 -
 .../util/xml/StreamSourceConverterLoader.java      |   42 -
 147 files changed, 9164 insertions(+), 6465 deletions(-)

diff --git a/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties
deleted file mode 100644
index 2c30758..0000000
--- a/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-name=dummy-component
-groupId=org.apache.camel
-artifactId=dummy-component
-version=3.1.0-SNAPSHOT
-projectName=Camel :: Catalog :: Dummy Component
-projectDescription=Camel Dummy Component
diff --git a/catalog/dummy-component/src/generated/resources/dummy-component.json b/catalog/dummy-component/src/generated/resources/dummy-component.json
deleted file mode 100644
index 10671390..0000000
--- a/catalog/dummy-component/src/generated/resources/dummy-component.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "dummy-component",
-    "title": "Dummy Component",
-    "description": "Camel Dummy Component",
-    "deprecated": false,
-    "groupId": "org.apache.camel",
-    "artifactId": "dummy-component",
-    "version": "3.1.0-SNAPSHOT"
-  }
-}
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
similarity index 96%
rename from components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java
rename to components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
index 8b1da1c..4edf5a6 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
@@ -9,9 +9,9 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class XmlSignatureComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
+public class XmlSignerComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
 
-    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(XmlSignatureComponent target) {
+    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(XmlSignerComponent target) {
         if (target.getSignerConfiguration() == null) {
             target.setSignerConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration());
         }
@@ -20,7 +20,7 @@ public class XmlSignatureComponentConfigurer extends PropertyConfigurerSupport i
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        XmlSignatureComponent target = (XmlSignatureComponent) obj;
+        XmlSignerComponent target = (XmlSignerComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "addkeyinforeference":
         case "addKeyInfoReference": getOrCreateConfiguration(target).setAddKeyInfoReference(property(camelContext, java.lang.Boolean.class, value)); return true;
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
index 84bf921..3d41fde 100644
--- a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
+++ b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.xmlsecurity.XmlSignatureComponent
+class=org.apache.camel.component.xmlsecurity.XmlSignerComponent
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
index ee20a42..6bf5bed 100644
--- a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
+++ b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.xmlsecurity.XmlSignatureComponentConfigurer
+class=org.apache.camel.component.xmlsecurity.XmlSignerComponentConfigurer
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
index 7830cff..49f475a 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
@@ -12,7 +12,7 @@
     "consumerOnly": false,
     "producerOnly": true,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignatureComponent",
+    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignerComponent",
     "firstVersion": "2.12.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
similarity index 91%
rename from components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
rename to components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
index 83e7006..1a64109 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
@@ -1,66 +1,66 @@
-/*
- * 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.component.xmlsecurity;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-
-@Component("xmlsecurity-sign")
-public class XmlSignatureComponent extends DefaultComponent {
-
-    @Metadata(label = "advanced")
-    private XmlSignerConfiguration signerConfiguration;
-
-    public XmlSignatureComponent() {
-    }
-
-    public XmlSignatureComponent(CamelContext context) {
-        super(context);
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining,
-                                      Map<String, Object> parameters) throws Exception {
-
-        XmlSignerConfiguration config = signerConfiguration != null ? signerConfiguration.copy() : new XmlSignerConfiguration();
-        XmlSignerEndpoint endpoint = new XmlSignerEndpoint(uri, this, config);
-        endpoint.setName(remaining);
-        setProperties(endpoint, parameters);
-        return endpoint;
-    }
-
-    public XmlSignerConfiguration getSignerConfiguration() {
-        if (signerConfiguration == null) {
-            signerConfiguration = new XmlSignerConfiguration();
-        }
-        return signerConfiguration;
-    }
-
-    /**
-     * To use a shared XmlSignerConfiguration configuration to use as base for configuring endpoints.
-     */
-    public void setSignerConfiguration(XmlSignerConfiguration signerConfiguration) {
-        this.signerConfiguration = signerConfiguration;
-    }
-
-}
+/*
+ * 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.component.xmlsecurity;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.DefaultComponent;
+
+@Component("xmlsecurity-sign")
+public class XmlSignerComponent extends DefaultComponent {
+
+    @Metadata(label = "advanced")
+    private XmlSignerConfiguration signerConfiguration;
+
+    public XmlSignerComponent() {
+    }
+
+    public XmlSignerComponent(CamelContext context) {
+        super(context);
+    }
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining,
+                                      Map<String, Object> parameters) throws Exception {
+
+        XmlSignerConfiguration config = signerConfiguration != null ? signerConfiguration.copy() : new XmlSignerConfiguration();
+        XmlSignerEndpoint endpoint = new XmlSignerEndpoint(uri, this, config);
+        endpoint.setName(remaining);
+        setProperties(endpoint, parameters);
+        return endpoint;
+    }
+
+    public XmlSignerConfiguration getSignerConfiguration() {
+        if (signerConfiguration == null) {
+            signerConfiguration = new XmlSignerConfiguration();
+        }
+        return signerConfiguration;
+    }
+
+    /**
+     * To use a shared XmlSignerConfiguration configuration to use as base for configuring endpoints.
+     */
+    public void setSignerConfiguration(XmlSignerConfiguration signerConfiguration) {
+        this.signerConfiguration = signerConfiguration;
+    }
+
+}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
index a3a8c93..7634aa5 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
@@ -40,7 +40,7 @@ public class XmlSignerEndpoint extends DefaultEndpoint {
     @UriParam
     private XmlSignerConfiguration configuration;
 
-    public XmlSignerEndpoint(String uri, XmlSignatureComponent component, XmlSignerConfiguration configuration) {
+    public XmlSignerEndpoint(String uri, XmlSignerComponent component, XmlSignerConfiguration configuration) {
         super(uri, component);
         this.configuration = configuration;
     }
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 327d574..3347fd4 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -236,6 +236,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-base</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-bean-validator</artifactId>
 		</dependency>
 		<dependency>
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 1bba5e4..52fc654 100644
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++ b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -1,7 +1,7 @@
 # Generated by camel build tools - do NOT edit this file!
-languages=ref exchangeProperty file simple constant tokenize header
+languages=constant exchangeProperty file header ref simple tokenize
 groupId=org.apache.camel
 artifactId=camel-base
-version=3.1.0-SNAPSHOT
+version=3.2.0-SNAPSHOT
 projectName=Camel :: Base
 projectDescription=The Base Camel Framework
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json b/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
index 6bc6773..f91599a 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.ConstantExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json b/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
index 65b6c8c..4c67e3e 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.HeaderExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json b/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
index 7833562..da11bca 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.ExchangePropertyExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json b/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
index 7227225..78e820c 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.RefExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
index ad14594..02918b4 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
index 9dc2b0a..93453d12 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json b/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
index bafecf2..ec3c7ff 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.TokenizerExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "token": { "kind": "attribute", "displayName": "Token", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The (start) token to use as tokenizer, for example you can use the new line token. You can use simple language as the token to support dynamic tokens." },
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
index 4766e2d..a3fb33a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
@@ -20,7 +20,7 @@ import javax.annotation.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
+import org.apache.camel.component.xmlsecurity.XmlSignerComponent;
 
 /**
  * Used to sign exchanges using the XML signature specification.
@@ -47,7 +47,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
      */
     interface XmlsecuritySignComponentBuilder
             extends
-                ComponentBuilder<XmlSignatureComponent> {
+                ComponentBuilder<XmlSignerComponent> {
         /**
          * In order to protect the KeyInfo element from tampering you can add a
          * reference to the signed info element so that it is protected via the
@@ -524,15 +524,15 @@ public interface XmlsecuritySignComponentBuilderFactory {
 
     class XmlsecuritySignComponentBuilderImpl
             extends
-                AbstractComponentBuilder<XmlSignatureComponent>
+                AbstractComponentBuilder<XmlSignerComponent>
             implements
                 XmlsecuritySignComponentBuilder {
         @Override
-        protected XmlSignatureComponent buildConcreteComponent() {
-            return new XmlSignatureComponent();
+        protected XmlSignerComponent buildConcreteComponent() {
+            return new XmlSignerComponent();
         }
         private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(
-                org.apache.camel.component.xmlsecurity.XmlSignatureComponent component) {
+                org.apache.camel.component.xmlsecurity.XmlSignerComponent component) {
             if (component.getSignerConfiguration() == null) {
                 component.setSignerConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration());
             }
@@ -544,35 +544,35 @@ public interface XmlsecuritySignComponentBuilderFactory {
                 String name,
                 Object value) {
             switch (name) {
-            case "addKeyInfoReference": getOrCreateConfiguration((XmlSignatureComponent) component).setAddKeyInfoReference((java.lang.Boolean) value); return true;
-            case "baseUri": getOrCreateConfiguration((XmlSignatureComponent) component).setBaseUri((java.lang.String) value); return true;
-            case "canonicalizationMethod": getOrCreateConfiguration((XmlSignatureComponent) component).setCanonicalizationMethod((javax.xml.crypto.AlgorithmMethod) value); return true;
-            case "clearHeaders": getOrCreateConfiguration((XmlSignatureComponent) component).setClearHeaders((java.lang.Boolean) value); return true;
-            case "contentObjectId": getOrCreateConfiguration((XmlSignatureComponent) component).setContentObjectId((java.lang.String) value); return true;
-            case "contentReferenceType": getOrCreateConfiguration((XmlSignatureComponent) component).setContentReferenceType((java.lang.String) value); return true;
-            case "contentReferenceUri": getOrCreateConfiguration((XmlSignatureComponent) component).setContentReferenceUri((java.lang.String) value); return true;
-            case "cryptoContextProperties": getOrCreateConfiguration((XmlSignatureComponent) component).setCryptoContextProperties((java.util.Map) value); return true;
-            case "digestAlgorithm": getOrCreateConfiguration((XmlSignatureComponent) component).setDigestAlgorithm((java.lang.String) value); return true;
-            case "disallowDoctypeDecl": getOrCreateConfiguration((XmlSignatureComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
-            case "keyAccessor": getOrCreateConfiguration((XmlSignatureComponent) component).setKeyAccessor((org.apache.camel.component.xmlsecurity.api.KeyAccessor) value); return true;
-            case "omitXmlDeclaration": getOrCreateConfiguration((XmlSignatureComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
-            case "outputXmlEncoding": getOrCreateConfiguration((XmlSignatureComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
-            case "lazyStartProducer": ((XmlSignatureComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "parentLocalName": getOrCreateConfiguration((XmlSignatureComponent) component).setParentLocalName((java.lang.String) value); return true;
-            case "parentNamespace": getOrCreateConfiguration((XmlSignatureComponent) component).setParentNamespace((java.lang.String) value); return true;
-            case "parentXpath": getOrCreateConfiguration((XmlSignatureComponent) component).setParentXpath((javax.xml.crypto.dsig.spec.XPathFilterParameterSpec) value); return true;
-            case "plainText": getOrCreateConfiguration((XmlSignatureComponent) component).setPlainText((java.lang.Boolean) value); return true;
-            case "plainTextEncoding": getOrCreateConfiguration((XmlSignatureComponent) component).setPlainTextEncoding((java.lang.String) value); return true;
-            case "prefixForXmlSignatureNamespace": getOrCreateConfiguration((XmlSignatureComponent) component).setPrefixForXmlSignatureNamespace((java.lang.String) value); return true;
-            case "properties": getOrCreateConfiguration((XmlSignatureComponent) component).setProperties((org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties) value); return true;
-            case "schemaResourceUri": getOrCreateConfiguration((XmlSignatureComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
-            case "signatureAlgorithm": getOrCreateConfiguration((XmlSignatureComponent) component).setSignatureAlgorithm((java.lang.String) value); return true;
-            case "signatureId": getOrCreateConfiguration((XmlSignatureComponent) component).setSignatureId((java.lang.String) value); return true;
-            case "transformMethods": getOrCreateConfiguration((XmlSignatureComponent) component).setTransformMethods((java.util.List) value); return true;
-            case "xpathsToIdAttributes": getOrCreateConfiguration((XmlSignatureComponent) component).setXpathsToIdAttributes((java.util.List) value); return true;
-            case "basicPropertyBinding": ((XmlSignatureComponent) component).setBasicPropertyBinding((boolean) value); return true;
-            case "signerConfiguration": ((XmlSignatureComponent) component).setSignerConfiguration((org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration) value); return true;
-            case "uriDereferencer": getOrCreateConfiguration((XmlSignatureComponent) component).setUriDereferencer((javax.xml.crypto.URIDereferencer) value); return true;
+            case "addKeyInfoReference": getOrCreateConfiguration((XmlSignerComponent) component).setAddKeyInfoReference((java.lang.Boolean) value); return true;
+            case "baseUri": getOrCreateConfiguration((XmlSignerComponent) component).setBaseUri((java.lang.String) value); return true;
+            case "canonicalizationMethod": getOrCreateConfiguration((XmlSignerComponent) component).setCanonicalizationMethod((javax.xml.crypto.AlgorithmMethod) value); return true;
+            case "clearHeaders": getOrCreateConfiguration((XmlSignerComponent) component).setClearHeaders((java.lang.Boolean) value); return true;
+            case "contentObjectId": getOrCreateConfiguration((XmlSignerComponent) component).setContentObjectId((java.lang.String) value); return true;
+            case "contentReferenceType": getOrCreateConfiguration((XmlSignerComponent) component).setContentReferenceType((java.lang.String) value); return true;
+            case "contentReferenceUri": getOrCreateConfiguration((XmlSignerComponent) component).setContentReferenceUri((java.lang.String) value); return true;
+            case "cryptoContextProperties": getOrCreateConfiguration((XmlSignerComponent) component).setCryptoContextProperties((java.util.Map) value); return true;
+            case "digestAlgorithm": getOrCreateConfiguration((XmlSignerComponent) component).setDigestAlgorithm((java.lang.String) value); return true;
+            case "disallowDoctypeDecl": getOrCreateConfiguration((XmlSignerComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
+            case "keyAccessor": getOrCreateConfiguration((XmlSignerComponent) component).setKeyAccessor((org.apache.camel.component.xmlsecurity.api.KeyAccessor) value); return true;
+            case "omitXmlDeclaration": getOrCreateConfiguration((XmlSignerComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
+            case "outputXmlEncoding": getOrCreateConfiguration((XmlSignerComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
+            case "lazyStartProducer": ((XmlSignerComponent) component).setLazyStartProducer((boolean) value); return true;
+            case "parentLocalName": getOrCreateConfiguration((XmlSignerComponent) component).setParentLocalName((java.lang.String) value); return true;
+            case "parentNamespace": getOrCreateConfiguration((XmlSignerComponent) component).setParentNamespace((java.lang.String) value); return true;
+            case "parentXpath": getOrCreateConfiguration((XmlSignerComponent) component).setParentXpath((javax.xml.crypto.dsig.spec.XPathFilterParameterSpec) value); return true;
+            case "plainText": getOrCreateConfiguration((XmlSignerComponent) component).setPlainText((java.lang.Boolean) value); return true;
+            case "plainTextEncoding": getOrCreateConfiguration((XmlSignerComponent) component).setPlainTextEncoding((java.lang.String) value); return true;
+            case "prefixForXmlSignatureNamespace": getOrCreateConfiguration((XmlSignerComponent) component).setPrefixForXmlSignatureNamespace((java.lang.String) value); return true;
+            case "properties": getOrCreateConfiguration((XmlSignerComponent) component).setProperties((org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties) value); return true;
+            case "schemaResourceUri": getOrCreateConfiguration((XmlSignerComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
+            case "signatureAlgorithm": getOrCreateConfiguration((XmlSignerComponent) component).setSignatureAlgorithm((java.lang.String) value); return true;
+            case "signatureId": getOrCreateConfiguration((XmlSignerComponent) component).setSignatureId((java.lang.String) value); return true;
+            case "transformMethods": getOrCreateConfiguration((XmlSignerComponent) component).setTransformMethods((java.util.List) value); return true;
+            case "xpathsToIdAttributes": getOrCreateConfiguration((XmlSignerComponent) component).setXpathsToIdAttributes((java.util.List) value); return true;
+            case "basicPropertyBinding": ((XmlSignerComponent) component).setBasicPropertyBinding((boolean) value); return true;
+            case "signerConfiguration": ((XmlSignerComponent) component).setSignerConfiguration((org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration) value); return true;
+            case "uriDereferencer": getOrCreateConfiguration((XmlSignerComponent) component).setUriDereferencer((javax.xml.crypto.URIDereferencer) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 7e246b1..cbca26f 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -6789,7 +6789,7 @@
     "consumerOnly": false,
     "producerOnly": true,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignatureComponent",
+    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignerComponent",
     "firstVersion": "2.12.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index c07c85f..79523d6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -30,6 +30,7 @@ public interface EndpointBuilderFactory
         extends
             org.apache.camel.builder.endpoint.dsl.AMQPEndpointBuilderFactory.AMQPBuilders,
             org.apache.camel.builder.endpoint.dsl.AS2EndpointBuilderFactory.AS2Builders,
+            org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2Builders,
             org.apache.camel.builder.endpoint.dsl.ActiveMQEndpointBuilderFactory.ActiveMQBuilders,
             org.apache.camel.builder.endpoint.dsl.AhcEndpointBuilderFactory.AhcBuilders,
             org.apache.camel.builder.endpoint.dsl.ApnsEndpointBuilderFactory.ApnsBuilders,
@@ -71,12 +72,15 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.CouchbaseEndpointBuilderFactory.CouchbaseBuilders,
             org.apache.camel.builder.endpoint.dsl.CronEndpointBuilderFactory.CronBuilders,
             org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory.CryptoCmsBuilders,
+            org.apache.camel.builder.endpoint.dsl.Cw2EndpointBuilderFactory.Cw2Builders,
             org.apache.camel.builder.endpoint.dsl.CwEndpointBuilderFactory.CwBuilders,
             org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory.CxfBuilders,
             org.apache.camel.builder.endpoint.dsl.CxfRsEndpointBuilderFactory.CxfRsBuilders,
             org.apache.camel.builder.endpoint.dsl.DataFormatEndpointBuilderFactory.DataFormatBuilders,
             org.apache.camel.builder.endpoint.dsl.DataSetEndpointBuilderFactory.DataSetBuilders,
             org.apache.camel.builder.endpoint.dsl.DataSetTestEndpointBuilderFactory.DataSetTestBuilders,
+            org.apache.camel.builder.endpoint.dsl.Ddb2EndpointBuilderFactory.Ddb2Builders,
+            org.apache.camel.builder.endpoint.dsl.Ddb2StreamEndpointBuilderFactory.Ddb2StreamBuilders,
             org.apache.camel.builder.endpoint.dsl.DdbEndpointBuilderFactory.DdbBuilders,
             org.apache.camel.builder.endpoint.dsl.DdbStreamEndpointBuilderFactory.DdbStreamBuilders,
             org.apache.camel.builder.endpoint.dsl.DebeziumMongodbEndpointBuilderFactory.DebeziumMongodbBuilders,
@@ -103,7 +107,9 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchBuilders,
             org.apache.camel.builder.endpoint.dsl.ElsqlEndpointBuilderFactory.ElsqlBuilders,
             org.apache.camel.builder.endpoint.dsl.ElytronEndpointBuilderFactory.ElytronBuilders,
-            org.apache.camel.builder.endpoint.dsl.EtcdEndpointBuilderFactory.EtcdBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdKeysEndpointBuilderFactory.EtcdKeysBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdStatsEndpointBuilderFactory.EtcdStatsBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdWatchEndpointBuilderFactory.EtcdWatchBuilders,
             org.apache.camel.builder.endpoint.dsl.EventAdminEndpointBuilderFactory.EventAdminBuilders,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory.EventBuilders,
             org.apache.camel.builder.endpoint.dsl.ExecEndpointBuilderFactory.ExecBuilders,
@@ -153,6 +159,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.HdfsEndpointBuilderFactory.HdfsBuilders,
             org.apache.camel.builder.endpoint.dsl.HipchatEndpointBuilderFactory.HipchatBuilders,
             org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory.HttpBuilders,
+            org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2Builders,
             org.apache.camel.builder.endpoint.dsl.IAMEndpointBuilderFactory.IAMBuilders,
             org.apache.camel.builder.endpoint.dsl.IOTAEndpointBuilderFactory.IOTABuilders,
             org.apache.camel.builder.endpoint.dsl.IPFSEndpointBuilderFactory.IPFSBuilders,
@@ -190,7 +197,9 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory.KMSBuilders,
             org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory.KafkaBuilders,
             org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory.KeystoneBuilders,
+            org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory.Kinesis2Builders,
             org.apache.camel.builder.endpoint.dsl.KinesisEndpointBuilderFactory.KinesisBuilders,
+            org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory.KinesisFirehose2Builders,
             org.apache.camel.builder.endpoint.dsl.KinesisFirehoseEndpointBuilderFactory.KinesisFirehoseBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesConfigMapsEndpointBuilderFactory.KubernetesConfigMapsBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesDeploymentsEndpointBuilderFactory.KubernetesDeploymentsBuilders,
@@ -207,6 +216,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.KubernetesServiceAccountsEndpointBuilderFactory.KubernetesServiceAccountsBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesServicesEndpointBuilderFactory.KubernetesServicesBuilders,
             org.apache.camel.builder.endpoint.dsl.KuduEndpointBuilderFactory.KuduBuilders,
+            org.apache.camel.builder.endpoint.dsl.Lambda2EndpointBuilderFactory.Lambda2Builders,
             org.apache.camel.builder.endpoint.dsl.LambdaEndpointBuilderFactory.LambdaBuilders,
             org.apache.camel.builder.endpoint.dsl.LanguageEndpointBuilderFactory.LanguageBuilders,
             org.apache.camel.builder.endpoint.dsl.LdapEndpointBuilderFactory.LdapBuilders,
@@ -283,6 +293,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.ServiceEndpointBuilderFactory.ServiceBuilders,
             org.apache.camel.builder.endpoint.dsl.ServiceNowEndpointBuilderFactory.ServiceNowBuilders,
             org.apache.camel.builder.endpoint.dsl.ServletEndpointBuilderFactory.ServletBuilders,
+            org.apache.camel.builder.endpoint.dsl.Ses2EndpointBuilderFactory.Ses2Builders,
             org.apache.camel.builder.endpoint.dsl.SesEndpointBuilderFactory.SesBuilders,
             org.apache.camel.builder.endpoint.dsl.SftpEndpointBuilderFactory.SftpBuilders,
             org.apache.camel.builder.endpoint.dsl.SipEndpointBuilderFactory.SipBuilders,
@@ -292,6 +303,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SlackEndpointBuilderFactory.SlackBuilders,
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory.SmppBuilders,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory.SnmpBuilders,
+            org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory.Sns2Builders,
             org.apache.camel.builder.endpoint.dsl.SnsEndpointBuilderFactory.SnsBuilders,
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrBuilders,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory.SoroushBotBuilders,
@@ -303,6 +315,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SpringWebserviceEndpointBuilderFactory.SpringWebserviceBuilders,
             org.apache.camel.builder.endpoint.dsl.SqlEndpointBuilderFactory.SqlBuilders,
             org.apache.camel.builder.endpoint.dsl.SqlStoredEndpointBuilderFactory.SqlStoredBuilders,
+            org.apache.camel.builder.endpoint.dsl.Sqs2EndpointBuilderFactory.Sqs2Builders,
             org.apache.camel.builder.endpoint.dsl.SqsEndpointBuilderFactory.SqsBuilders,
             org.apache.camel.builder.endpoint.dsl.SshEndpointBuilderFactory.SshBuilders,
             org.apache.camel.builder.endpoint.dsl.StAXEndpointBuilderFactory.StAXBuilders,
@@ -337,7 +350,8 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.XChangeEndpointBuilderFactory.XChangeBuilders,
             org.apache.camel.builder.endpoint.dsl.XJEndpointBuilderFactory.XJBuilders,
             org.apache.camel.builder.endpoint.dsl.XQueryEndpointBuilderFactory.XQueryBuilders,
-            org.apache.camel.builder.endpoint.dsl.XmlSignatureEndpointBuilderFactory.XmlSignatureBuilders,
+            org.apache.camel.builder.endpoint.dsl.XmlSignerEndpointBuilderFactory.XmlSignerBuilders,
+            org.apache.camel.builder.endpoint.dsl.XmlVerifierEndpointBuilderFactory.XmlVerifierBuilders,
             org.apache.camel.builder.endpoint.dsl.XmppEndpointBuilderFactory.XmppBuilders,
             org.apache.camel.builder.endpoint.dsl.XsltEndpointBuilderFactory.XsltBuilders,
             org.apache.camel.builder.endpoint.dsl.XsltSaxonEndpointBuilderFactory.XsltSaxonBuilders,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index c2da52a..f5b519f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -27,6 +27,7 @@ public interface EndpointBuilders
         extends
             org.apache.camel.builder.endpoint.dsl.AMQPEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.AS2EndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ActiveMQEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.AhcEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ApnsEndpointBuilderFactory,
@@ -68,12 +69,15 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.CouchbaseEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CronEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Cw2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CwEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CxfRsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataFormatEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataSetEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataSetTestEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ddb2EndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ddb2StreamEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DdbEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DdbStreamEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DebeziumMongodbEndpointBuilderFactory,
@@ -100,7 +104,9 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElsqlEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElytronEndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.EtcdEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdKeysEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdStatsEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdWatchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventAdminEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ExecEndpointBuilderFactory,
@@ -150,6 +156,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.HdfsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.HipchatEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IAMEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IOTAEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IPFSEndpointBuilderFactory,
@@ -187,7 +194,9 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KinesisEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KinesisFirehoseEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesConfigMapsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesDeploymentsEndpointBuilderFactory,
@@ -204,6 +213,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.KubernetesServiceAccountsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesServicesEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KuduEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Lambda2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LambdaEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LanguageEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LdapEndpointBuilderFactory,
@@ -280,6 +290,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.ServiceEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ServiceNowEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ServletEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ses2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SesEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SftpEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SipEndpointBuilderFactory,
@@ -289,6 +300,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SlackEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SnsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory,
@@ -300,6 +312,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SpringWebserviceEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqlEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqlStoredEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Sqs2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SshEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.StAXEndpointBuilderFactory,
@@ -334,7 +347,8 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.XChangeEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XJEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XQueryEndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.XmlSignatureEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.XmlSignerEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.XmlVerifierEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XmppEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XsltEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XsltSaxonEndpointBuilderFactory,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index 33762bb..b041177 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
- * Messaging with AMQP protocol using Apache QPid Client. This class extends
- * JmsEndpoint because it uses Apache Qpid JMS-compatible client for performing
- * the AMQP connectivity.
+ * Messaging with AMQP protocol using Apache QPid Client.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -287,44 +285,6 @@ public interface AMQPEndpointBuilderFactory {
             return this;
         }
         /**
-         * 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.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default AMQPEndpointConsumerBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * 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.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default AMQPEndpointConsumerBuilder bridgeErrorHandler(
-                String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details.
          * 
@@ -5431,9 +5391,7 @@ public interface AMQPEndpointBuilderFactory {
     public interface AMQPBuilders {
         /**
          * AMQP (camel-amqp)
-         * Messaging with AMQP protocol using Apache QPid Client. This class
-         * extends JmsEndpoint because it uses Apache Qpid JMS-compatible client
-         * for performing the AMQP connectivity.
+         * Messaging with AMQP protocol using Apache QPid Client.
          * 
          * Category: messaging
          * Since: 1.2
@@ -5455,9 +5413,7 @@ public interface AMQPEndpointBuilderFactory {
     }
     /**
      * AMQP (camel-amqp)
-     * Messaging with AMQP protocol using Apache QPid Client. This class extends
-     * JmsEndpoint because it uses Apache Qpid JMS-compatible client for
-     * performing the AMQP connectivity.
+     * Messaging with AMQP protocol using Apache QPid Client.
      * 
      * Category: messaging
      * Since: 1.2
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
similarity index 72%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index 4ffd4f3..52c59b3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -22,20 +22,20 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EC2EndpointBuilderFactory {
+public interface AWS2EC2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS EC2 component.
+     * Builder for endpoint for the AWS 2 EC2 component.
      */
-    public interface EC2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEC2EndpointBuilder advanced() {
-            return (AdvancedEC2EndpointBuilder) this;
+    public interface AWS2EC2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedAWS2EC2EndpointBuilder advanced() {
+            return (AdvancedAWS2EC2EndpointBuilder) this;
         }
         /**
          * Amazon AWS Access Key.
@@ -44,19 +44,19 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder accessKey(String accessKey) {
+        default AWS2EC2EndpointBuilder accessKey(String accessKey) {
             doSetProperty("accessKey", accessKey);
             return this;
         }
         /**
          * To use a existing configured AmazonEC2Client as client.
          * 
-         * The option is a: <code>com.amazonaws.services.ec2.AmazonEC2</code>
-         * type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.ec2.Ec2Client</code> type.
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder amazonEc2Client(Object amazonEc2Client) {
+        default AWS2EC2EndpointBuilder amazonEc2Client(Object amazonEc2Client) {
             doSetProperty("amazonEc2Client", amazonEc2Client);
             return this;
         }
@@ -64,11 +64,11 @@ public interface EC2EndpointBuilderFactory {
          * To use a existing configured AmazonEC2Client as client.
          * 
          * The option will be converted to a
-         * <code>com.amazonaws.services.ec2.AmazonEC2</code> type.
+         * <code>software.amazon.awssdk.services.ec2.Ec2Client</code> type.
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder amazonEc2Client(String amazonEc2Client) {
+        default AWS2EC2EndpointBuilder amazonEc2Client(String amazonEc2Client) {
             doSetProperty("amazonEc2Client", amazonEc2Client);
             return this;
         }
@@ -88,7 +88,8 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EC2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default AWS2EC2EndpointBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,7 +109,8 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EC2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default AWS2EC2EndpointBuilder lazyStartProducer(
+                String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -119,12 +121,13 @@ public interface EC2EndpointBuilderFactory {
          * unmonitorInstances, createTags or deleteTags.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code>
+         * type.
          * 
          * Required: true
          * Group: producer
          */
-        default EC2EndpointBuilder operation(EC2Operations operation) {
+        default AWS2EC2EndpointBuilder operation(AWS2EC2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -135,12 +138,13 @@ public interface EC2EndpointBuilderFactory {
          * unmonitorInstances, createTags or deleteTags.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code>
+         * type.
          * 
          * Required: true
          * Group: producer
          */
-        default EC2EndpointBuilder operation(String operation) {
+        default AWS2EC2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -151,7 +155,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyHost(String proxyHost) {
+        default AWS2EC2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
@@ -162,7 +166,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyPort(Integer proxyPort) {
+        default AWS2EC2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
@@ -174,32 +178,33 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyPort(String proxyPort) {
+        default AWS2EC2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
          * To define a proxy protocol when instantiating the EC2 client.
          * 
-         * The option is a: <code>com.amazonaws.Protocol</code> type.
+         * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
+         * type.
          * 
          * Default: HTTPS
          * Group: producer
          */
-        default EC2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default AWS2EC2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
          * To define a proxy protocol when instantiating the EC2 client.
          * 
-         * The option will be converted to a <code>com.amazonaws.Protocol</code>
-         * type.
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.core.Protocol</code> type.
          * 
          * Default: HTTPS
          * Group: producer
          */
-        default EC2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default AWS2EC2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -213,7 +218,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder region(String region) {
+        default AWS2EC2EndpointBuilder region(String region) {
             doSetProperty("region", region);
             return this;
         }
@@ -224,20 +229,20 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder secretKey(String secretKey) {
+        default AWS2EC2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS EC2 component.
+     * Advanced builder for endpoint for the AWS 2 EC2 component.
      */
-    public interface AdvancedEC2EndpointBuilder
+    public interface AdvancedAWS2EC2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default EC2EndpointBuilder basic() {
-            return (EC2EndpointBuilder) this;
+        default AWS2EC2EndpointBuilder basic() {
+            return (AWS2EC2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -248,7 +253,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder basicPropertyBinding(
+        default AdvancedAWS2EC2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -262,7 +267,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder basicPropertyBinding(
+        default AdvancedAWS2EC2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -276,7 +281,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedAWS2EC2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -289,7 +294,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedAWS2EC2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -297,9 +302,9 @@ public interface EC2EndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> enum.
+     * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code> enum.
      */
-    enum EC2Operations {
+    enum AWS2EC2Operations {
         createAndRunInstances,
         startInstances,
         stopInstances,
@@ -314,50 +319,50 @@ public interface EC2EndpointBuilderFactory {
     }
 
     /**
-     * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
+     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
         http,
         https;
     }
 
-    public interface EC2Builders {
+    public interface AWS2EC2Builders {
         /**
-         * AWS EC2 (camel-aws-ec2)
-         * The aws-ec2 is used for managing Amazon EC2 instances.
+         * AWS 2 EC2 (camel-aws2-ec2)
+         * The aws2-ec2 is used for managing Amazon EC2 instances.
          * 
          * Category: cloud,management
-         * Since: 2.16
-         * Maven coordinates: org.apache.camel:camel-aws-ec2
+         * Since: 3.1
+         * Maven coordinates: org.apache.camel:camel-aws2-ec2
          * 
-         * Syntax: <code>aws-ec2:label</code>
+         * Syntax: <code>aws2-ec2:label</code>
          * 
          * Path parameter: label (required)
          * Logical name
          */
-        default EC2EndpointBuilder awsEc2(String path) {
-            return EC2EndpointBuilderFactory.awsEc2(path);
+        default AWS2EC2EndpointBuilder aws2Ec2(String path) {
+            return AWS2EC2EndpointBuilderFactory.aws2Ec2(path);
         }
     }
     /**
-     * AWS EC2 (camel-aws-ec2)
-     * The aws-ec2 is used for managing Amazon EC2 instances.
+     * AWS 2 EC2 (camel-aws2-ec2)
+     * The aws2-ec2 is used for managing Amazon EC2 instances.
      * 
      * Category: cloud,management
-     * Since: 2.16
-     * Maven coordinates: org.apache.camel:camel-aws-ec2
+     * Since: 3.1
+     * Maven coordinates: org.apache.camel:camel-aws2-ec2
      * 
-     * Syntax: <code>aws-ec2:label</code>
+     * Syntax: <code>aws2-ec2:label</code>
      * 
      * Path parameter: label (required)
      * Logical name
      */
-    static EC2EndpointBuilder awsEc2(String path) {
-        class EC2EndpointBuilderImpl extends AbstractEndpointBuilder implements EC2EndpointBuilder, AdvancedEC2EndpointBuilder {
-            public EC2EndpointBuilderImpl(String path) {
-                super("aws-ec2", path);
+    static AWS2EC2EndpointBuilder aws2Ec2(String path) {
+        class AWS2EC2EndpointBuilderImpl extends AbstractEndpointBuilder implements AWS2EC2EndpointBuilder, AdvancedAWS2EC2EndpointBuilder {
+            public AWS2EC2EndpointBuilderImpl(String path) {
+                super("aws2-ec2", path);
             }
         }
-        return new EC2EndpointBuilderImpl(path);
+        return new AWS2EC2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 90d081e..05cf2b1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -290,44 +290,6 @@ public interface ActiveMQEndpointBuilderFactory {
             return this;
         }
         /**
-         * 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.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default ActiveMQEndpointConsumerBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * 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.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default ActiveMQEndpointConsumerBuilder bridgeErrorHandler(
-                String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index 43d259c..38a40e6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -559,7 +559,7 @@ public interface AsteriskEndpointBuilderFactory {
          * Syntax: <code>asterisk:name</code>
          * 
          * Path parameter: name (required)
-         * Logical name
+         * Name of component
          */
         default AsteriskEndpointBuilder asterisk(String path) {
             return AsteriskEndpointBuilderFactory.asterisk(path);
@@ -576,7 +576,7 @@ public interface AsteriskEndpointBuilderFactory {
      * Syntax: <code>asterisk:name</code>
      * 
      * Path parameter: name (required)
-     * Logical name
+     * Name of component
      */
     static AsteriskEndpointBuilder asterisk(String path) {
         class AsteriskEndpointBuilderImpl extends AbstractEndpointBuilder implements AsteriskEndpointBuilder, AdvancedAsteriskEndpointBuilder {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 5237e81..d212b61 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -460,7 +460,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
         }
         /**
          * Whether to automatic bind multipart/form-data as attachments on the
-         * Camel Exchange . The options attachmentMultipartBinding=true and
+         * 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
@@ -478,7 +478,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
         }
         /**
          * Whether to automatic bind multipart/form-data as attachments on the
-         * Camel Exchange . The options attachmentMultipartBinding=true and
+         * 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
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index 1ac69b3..47fb033 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -23,8 +23,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The Validator component performs bean validation of the message body using
- * the Java Bean Validation API. Camel uses the reference implementation, which
- * is Hibernate Validator.
+ * the Java Bean Validation API.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -323,8 +322,7 @@ public interface BeanValidatorEndpointBuilderFactory {
         /**
          * Bean Validator (camel-bean-validator)
          * The Validator component performs bean validation of the message body
-         * using the Java Bean Validation API. Camel uses the reference
-         * implementation, which is Hibernate Validator.
+         * using the Java Bean Validation API.
          * 
          * Category: validation
          * Since: 2.3
@@ -342,8 +340,7 @@ public interface BeanValidatorEndpointBuilderFactory {
     /**
      * Bean Validator (camel-bean-validator)
      * The Validator component performs bean validation of the message body
-     * using the Java Bean Validation API. Camel uses the reference
-     * implementation, which is Hibernate Validator.
+     * using the Java Bean Validation API.
      * 
      * Category: validation
      * Since: 2.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index 1dbbc8a..acb91e5 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -82,28 +82,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointConsumerBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
-            return this;
-        }
-        /**
-         * The public key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointConsumerBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
-            return this;
-        }
-        /**
          * 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
@@ -547,6 +525,74 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option is a: <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(
+                String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: Braintree
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
          * The proxy host.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -580,6 +626,41 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
+        /**
+         * The access token granted by a merchant to another in order to process
+         * transactions on their behalf. Used in place of environment, merchant
+         * id, public key and private key fields.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
     }
 
     /**
@@ -681,20 +762,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The access token granted by a merchant to another in order to process
-         * transactions on their behalf. Used in place of environment, merchant
-         * id, public key and private key fields.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -775,63 +842,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder httpLogLevel(
-                Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     /**
@@ -877,28 +887,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointProducerBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
-            return this;
-        }
-        /**
-         * The public key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointProducerBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -941,6 +929,74 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option is a: <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogLevel(
+                String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: Braintree
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
          * The proxy host.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -974,17 +1030,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
-    }
-
-    /**
-     * Advanced builder for endpoint producers for the Braintree component.
-     */
-    public interface AdvancedBraintreeEndpointProducerBuilder
-            extends
-                EndpointProducerBuilder {
-        default BraintreeEndpointProducerBuilder basic() {
-            return (BraintreeEndpointProducerBuilder) this;
-        }
         /**
          * The access token granted by a merchant to another in order to process
          * transactions on their behalf. Used in place of environment, merchant
@@ -992,14 +1037,46 @@ public interface BraintreeEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: advanced
+         * Group: security
          */
-        default AdvancedBraintreeEndpointProducerBuilder accessToken(
-                String accessToken) {
+        default BraintreeEndpointProducerBuilder accessToken(String accessToken) {
             doSetProperty("accessToken", accessToken);
             return this;
         }
         /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointProducerBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointProducerBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
+    }
+
+    /**
+     * Advanced builder for endpoint producers for the Braintree component.
+     */
+    public interface AdvancedBraintreeEndpointProducerBuilder
+            extends
+                EndpointProducerBuilder {
+        default BraintreeEndpointProducerBuilder basic() {
+            return (BraintreeEndpointProducerBuilder) this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -1080,63 +1157,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder httpLogLevel(
-                Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     /**
@@ -1183,25 +1203,70 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
+         * Set logging level for http calls, see java.util.logging.Level.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.util.logging.Level</code> type.
          * 
-         * Group: common
+         * Group: logging
          */
-        default BraintreeEndpointBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
+        default BraintreeEndpointBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
             return this;
         }
         /**
-         * The public key provided by Braintree.
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder httpLogLevel(String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Default: Braintree
+         * Group: logging
          */
-        default BraintreeEndpointBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
+        default BraintreeEndpointBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
             return this;
         }
         /**
@@ -1238,6 +1303,41 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
+        /**
+         * The access token granted by a merchant to another in order to process
+         * transactions on their behalf. Used in place of environment, merchant
+         * id, public key and private key fields.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
     }
 
     /**
@@ -1251,19 +1351,6 @@ public interface BraintreeEndpointBuilderFactory {
             return (BraintreeEndpointBuilder) this;
         }
         /**
-         * The access token granted by a merchant to another in order to process
-         * transactions on their behalf. Used in place of environment, merchant
-         * id, public key and private key fields.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedBraintreeEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -1342,62 +1429,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder httpLogLevel(Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     public interface BraintreeBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
index 049241c..78412a1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The browse component is used for viewing the messages received on endpoints
- * that supports BrowsableEndpoint . This can be useful for testing,
- * visualisation tools or debugging. The exchanges sent to the endpoint are all
- * available to be browsed.
+ * that supports BrowsableEndpoint.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -410,9 +408,7 @@ public interface BrowseEndpointBuilderFactory {
         /**
          * Browse (camel-browse)
          * The browse component is used for viewing the messages received on
-         * endpoints that supports BrowsableEndpoint . This can be useful for
-         * testing, visualisation tools or debugging. The exchanges sent to the
-         * endpoint are all available to be browsed.
+         * endpoints that supports BrowsableEndpoint.
          * 
          * Category: core,monitoring
          * Since: 1.3
@@ -430,9 +426,7 @@ public interface BrowseEndpointBuilderFactory {
     /**
      * Browse (camel-browse)
      * The browse component is used for viewing the messages received on
-     * endpoints that supports BrowsableEndpoint . This can be useful for
-     * testing, visualisation tools or debugging. The exchanges sent to the
-     * endpoint are all available to be browsed.
+     * endpoints that supports BrowsableEndpoint.
      * 
      * Category: core,monitoring
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index c582dd3..42dfd9a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -163,7 +163,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -177,7 +177,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -191,7 +191,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -204,7 +204,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -217,8 +217,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -231,8 +230,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -741,7 +739,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -755,7 +753,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -769,7 +767,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -782,7 +780,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -795,8 +793,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -809,8 +806,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -1215,7 +1211,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -1229,7 +1225,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -1242,7 +1238,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -1255,7 +1251,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -1268,8 +1264,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -1282,8 +1277,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
index 1025781..62073f6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The cometd component is a transport for working with the Jetty implementation
- * of the cometd/bayeux protocol. Using this component in combination with the
- * dojo toolkit library it's possible to push Camel messages directly into the
- * browser using an AJAX based mechanism.
+ * of the cometd/bayeux protocol.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1137,9 +1135,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1163,9 +1159,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (Secure) (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1189,9 +1183,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1204,9 +1196,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
@@ -1230,9 +1220,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (Secure) (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
@@ -1256,9 +1244,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index df8914b..2aa44c4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -24,9 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The controlbus component provides easy management of Camel applications based
- * on the Control Bus EIP pattern. For example, by sending a message to an
- * Endpoint you can control the lifecycle of routes, or gather performance
- * statistics.
+ * on the Control Bus EIP pattern.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -267,9 +265,7 @@ public interface ControlBusEndpointBuilderFactory {
         /**
          * Control Bus (camel-controlbus)
          * The controlbus component provides easy management of Camel
-         * applications based on the Control Bus EIP pattern. For example, by
-         * sending a message to an Endpoint you can control the lifecycle of
-         * routes, or gather performance statistics.
+         * applications based on the Control Bus EIP pattern.
          * 
          * Category: core,monitoring
          * Since: 2.11
@@ -296,9 +292,7 @@ public interface ControlBusEndpointBuilderFactory {
     /**
      * Control Bus (camel-controlbus)
      * The controlbus component provides easy management of Camel applications
-     * based on the Control Bus EIP pattern. For example, by sending a message
-     * to an Endpoint you can control the lifecycle of routes, or gather
-     * performance statistics.
+     * based on the Control Bus EIP pattern.
      * 
      * Category: core,monitoring
      * Since: 2.11
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index 0465f5a..1db8b13 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -80,6 +80,102 @@ public interface CordaEndpointBuilderFactory {
             return this;
         }
         /**
+         * PageSpecification allows specification of a page number (starting
+         * from 1) and page size (defaulting to 200 with a maximum page size of
+         * (Integer.MAX_INT) Note: we default the page number to 200 to enable
+         * queries without requiring a page specification but enabling detection
+         * of large results sets that fall out of the 200 requirement. Max page
+         * size should be used with extreme caution as results may exceed your
+         * JVM memory footprint.
+         * 
+         * The option is a:
+         * <code>net.corda.core.node.services.vault.PageSpecification</code>
+         * type.
+         * 
+         * Default: 200
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder pageSpecification(
+                Object pageSpecification) {
+            doSetProperty("pageSpecification", pageSpecification);
+            return this;
+        }
+        /**
+         * PageSpecification allows specification of a page number (starting
+         * from 1) and page size (defaulting to 200 with a maximum page size of
+         * (Integer.MAX_INT) Note: we default the page number to 200 to enable
+         * queries without requiring a page specification but enabling detection
+         * of large results sets that fall out of the 200 requirement. Max page
+         * size should be used with extreme caution as results may exceed your
+         * JVM memory footprint.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.PageSpecification</code>
+         * type.
+         * 
+         * Default: 200
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder pageSpecification(
+                String pageSpecification) {
+            doSetProperty("pageSpecification", pageSpecification);
+            return this;
+        }
+        /**
+         * Whether to process snapshots or not.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder processSnapshot(
+                boolean processSnapshot) {
+            doSetProperty("processSnapshot", processSnapshot);
+            return this;
+        }
+        /**
+         * Whether to process snapshots or not.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder processSnapshot(
+                String processSnapshot) {
+            doSetProperty("processSnapshot", processSnapshot);
+            return this;
+        }
+        /**
+         * Sort allows specification of a set of entity attribute names and
+         * their associated directionality and null handling, to be applied upon
+         * processing a query specification.
+         * 
+         * The option is a: <code>net.corda.core.node.services.vault.Sort</code>
+         * type.
+         * 
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder sort(Object sort) {
+            doSetProperty("sort", sort);
+            return this;
+        }
+        /**
+         * Sort allows specification of a set of entity attribute names and
+         * their associated directionality and null handling, to be applied upon
+         * processing a query specification.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.Sort</code> type.
+         * 
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder sort(String sort) {
+            doSetProperty("sort", sort);
+            return this;
+        }
+        /**
          * Password for login.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -113,6 +209,46 @@ public interface CordaEndpointBuilderFactory {
             return (CordaEndpointConsumerBuilder) this;
         }
         /**
+         * A contract state (or just state) contains opaque data used by a
+         * contract program. It can be thought of as a disk file that the
+         * program can use to persist data across transactions. States are
+         * immutable: once created they are never updated, instead, any changes
+         * must generate a new successor state. States can be updated (consumed)
+         * only once: the notary is responsible for ensuring there is no double
+         * spending by only signing a transaction if the input states are all
+         * free.
+         * 
+         * The option is a:
+         * <code>java.lang.Class&lt;net.corda.core.contracts.ContractState&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder contractStateClass(
+                Class<Object> contractStateClass) {
+            doSetProperty("contractStateClass", contractStateClass);
+            return this;
+        }
+        /**
+         * A contract state (or just state) contains opaque data used by a
+         * contract program. It can be thought of as a disk file that the
+         * program can use to persist data across transactions. States are
+         * immutable: once created they are never updated, instead, any changes
+         * must generate a new successor state. States can be updated (consumed)
+         * only once: the notary is responsible for ensuring there is no double
+         * spending by only signing a transaction if the input states are all
+         * free.
+         * 
+         * The option will be converted to a
+         * <code>java.lang.Class&lt;net.corda.core.contracts.ContractState&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder contractStateClass(
+                String contractStateClass) {
+            doSetProperty("contractStateClass", contractStateClass);
+            return this;
+        }
+        /**
          * 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
@@ -170,6 +306,97 @@ public interface CordaEndpointBuilderFactory {
             return this;
         }
         /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option is a: <code>java.lang.Object[]</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicArguments(
+                Object[] flowLogicArguments) {
+            doSetProperty("flowLogicArguments", flowLogicArguments);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option will be converted to a <code>java.lang.Object[]</code>
+         * type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicArguments(
+                String flowLogicArguments) {
+            doSetProperty("flowLogicArguments", flowLogicArguments);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option is a:
+         * <code>java.lang.Class&lt;net.corda.core.flows.FlowLogic&lt;java.lang.Object&gt;&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicClass(
+                Class<Object> flowLogicClass) {
+            doSetProperty("flowLogicClass", flowLogicClass);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option will be converted to a
+         * <code>java.lang.Class&lt;net.corda.core.flows.FlowLogic&lt;java.lang.Object&gt;&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicClass(
+                String flowLogicClass) {
+            doSetProperty("flowLogicClass", flowLogicClass);
+            return this;
+        }
+        /**
+         * QueryCriteria assumes underlying schema tables are correctly indexed
+         * for performance.
+         * 
+         * The option is a:
+         * <code>net.corda.core.node.services.vault.QueryCriteria</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder queryCriteria(
+                Object queryCriteria) {
+            doSetProperty("queryCriteria", queryCriteria);
+            return this;
+        }
+        /**
+         * QueryCriteria assumes underlying schema tables are correctly indexed
+         * for performance.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.QueryCriteria</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder queryCriteria(
+                String queryCriteria) {
+            doSetProperty("queryCriteria", queryCriteria);
+            return this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index 6a05317..2c05929 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -146,7 +146,7 @@ public interface CryptoCmsEndpointBuilderFactory {
          * Sets the password of the private keys. It is assumed that all private
          * keys in the keystore have the same password. If not set then it is
          * assumed that the password of the private keys is given by the
-         * keystore password given in the KeyStoreParameters .
+         * keystore password given in the KeyStoreParameters.
          * 
          * The option is a: <code>char[]</code> type.
          * 
@@ -160,7 +160,7 @@ public interface CryptoCmsEndpointBuilderFactory {
          * Sets the password of the private keys. It is assumed that all private
          * keys in the keystore have the same password. If not set then it is
          * assumed that the password of the private keys is given by the
-         * keystore password given in the KeyStoreParameters .
+         * keystore password given in the KeyStoreParameters.
          * 
          * The option will be converted to a <code>char[]</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
similarity index 60%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index e3b210d..f35ab5e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -16,60 +16,50 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.time.Instant;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-cw component is used for sending metrics to an Amazon CloudWatch.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EKS2EndpointBuilderFactory {
+public interface Cw2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 EKS component.
+     * Builder for endpoint for the AWS 2 CloudWatch component.
      */
-    public interface EKS2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEKS2EndpointBuilder advanced() {
-            return (AdvancedEKS2EndpointBuilder) this;
+    public interface Cw2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedCw2EndpointBuilder advanced() {
+            return (AdvancedCw2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * To use a existing configured AWS EKS as client.
+         * To use the AmazonCloudWatch as the client.
          * 
          * The option is a:
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.cloudwatch.CloudWatchClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(Object eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default Cw2EndpointBuilder amazonCwClient(Object amazonCwClient) {
+            doSetProperty("amazonCwClient", amazonCwClient);
             return this;
         }
         /**
-         * To use a existing configured AWS EKS as client.
+         * To use the AmazonCloudWatch as the client.
          * 
          * The option will be converted to a
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.cloudwatch.CloudWatchClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(String eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default Cw2EndpointBuilder amazonCwClient(String amazonCwClient) {
+            doSetProperty("amazonCwClient", amazonCwClient);
             return this;
         }
         /**
@@ -88,7 +78,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default Cw2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,72 +98,57 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default Cw2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * The operation to perform.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
-         * 
-         * Required: true
-         * Group: producer
-         */
-        default EKS2EndpointBuilder operation(EKS2Operations operation) {
-            doSetProperty("operation", operation);
-            return this;
-        }
-        /**
-         * The operation to perform.
+         * The metric name.
          * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(String operation) {
-            doSetProperty("operation", operation);
+        default Cw2EndpointBuilder name(String name) {
+            doSetProperty("name", name);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the EKS client.
+         * To define a proxy host when instantiating the CW client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyHost(String proxyHost) {
+        default Cw2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the CW client.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(Integer proxyPort) {
+        default Cw2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the CW client.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(String proxyPort) {
+        default Cw2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the CW client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -181,12 +156,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Cw2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the CW client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -194,7 +169,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default Cw2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -208,31 +183,98 @@ public interface EKS2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder region(String region) {
+        default Cw2EndpointBuilder region(String region) {
             doSetProperty("region", region);
             return this;
         }
         /**
-         * Amazon AWS Secret Key.
+         * The metric timestamp.
+         * 
+         * The option is a: <code>java.time.Instant</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder timestamp(Instant timestamp) {
+            doSetProperty("timestamp", timestamp);
+            return this;
+        }
+        /**
+         * The metric timestamp.
+         * 
+         * The option will be converted to a <code>java.time.Instant</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder timestamp(String timestamp) {
+            doSetProperty("timestamp", timestamp);
+            return this;
+        }
+        /**
+         * The metric unit.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder secretKey(String secretKey) {
+        default Cw2EndpointBuilder unit(String unit) {
+            doSetProperty("unit", unit);
+            return this;
+        }
+        /**
+         * The metric value.
+         * 
+         * The option is a: <code>java.lang.Double</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder value(Double value) {
+            doSetProperty("value", value);
+            return this;
+        }
+        /**
+         * The metric value.
+         * 
+         * The option will be converted to a <code>java.lang.Double</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder value(String value) {
+            doSetProperty("value", value);
+            return this;
+        }
+        /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Cw2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Cw2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS 2 EKS component.
+     * Advanced builder for endpoint for the AWS 2 CloudWatch component.
      */
-    public interface AdvancedEKS2EndpointBuilder
+    public interface AdvancedCw2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default EKS2EndpointBuilder basic() {
-            return (EKS2EndpointBuilder) this;
+        default Cw2EndpointBuilder basic() {
+            return (Cw2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -243,7 +285,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder basicPropertyBinding(
+        default AdvancedCw2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -257,7 +299,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder basicPropertyBinding(
+        default AdvancedCw2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -271,7 +313,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedCw2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -284,24 +326,13 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedCw2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
     /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> enum.
-     */
-    enum EKS2Operations {
-        listClusters,
-        describeCluster,
-        createCluster,
-        deleteCluster;
-    }
-
-    /**
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
@@ -309,43 +340,45 @@ public interface EKS2EndpointBuilderFactory {
         https;
     }
 
-    public interface EKS2Builders {
+    public interface Cw2Builders {
         /**
-         * AWS 2 EKS (camel-aws2-eks)
-         * The aws-eks is used for managing Amazon EKS
+         * AWS 2 CloudWatch (camel-aws2-cw)
+         * The aws2-cw component is used for sending metrics to an Amazon
+         * CloudWatch.
          * 
-         * Category: cloud,management
+         * Category: cloud,monitoring
          * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-aws2-eks
+         * Maven coordinates: org.apache.camel:camel-aws2-cw
          * 
-         * Syntax: <code>aws2-eks:label</code>
+         * Syntax: <code>aws2-cw:namespace</code>
          * 
-         * Path parameter: label (required)
-         * Logical name
+         * Path parameter: namespace (required)
+         * The metric namespace
          */
-        default EKS2EndpointBuilder aws2Eks(String path) {
-            return EKS2EndpointBuilderFactory.aws2Eks(path);
+        default Cw2EndpointBuilder aws2Cw(String path) {
+            return Cw2EndpointBuilderFactory.aws2Cw(path);
         }
     }
     /**
-     * AWS 2 EKS (camel-aws2-eks)
-     * The aws-eks is used for managing Amazon EKS
+     * AWS 2 CloudWatch (camel-aws2-cw)
+     * The aws2-cw component is used for sending metrics to an Amazon
+     * CloudWatch.
      * 
-     * Category: cloud,management
+     * Category: cloud,monitoring
      * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-aws2-eks
+     * Maven coordinates: org.apache.camel:camel-aws2-cw
      * 
-     * Syntax: <code>aws2-eks:label</code>
+     * Syntax: <code>aws2-cw:namespace</code>
      * 
-     * Path parameter: label (required)
-     * Logical name
+     * Path parameter: namespace (required)
+     * The metric namespace
      */
-    static EKS2EndpointBuilder aws2Eks(String path) {
-        class EKS2EndpointBuilderImpl extends AbstractEndpointBuilder implements EKS2EndpointBuilder, AdvancedEKS2EndpointBuilder {
-            public EKS2EndpointBuilderImpl(String path) {
-                super("aws2-eks", path);
+    static Cw2EndpointBuilder aws2Cw(String path) {
+        class Cw2EndpointBuilderImpl extends AbstractEndpointBuilder implements Cw2EndpointBuilder, AdvancedCw2EndpointBuilder {
+            public Cw2EndpointBuilderImpl(String path) {
+                super("aws2-cw", path);
             }
         }
-        return new EKS2EndpointBuilderImpl(path);
+        return new Cw2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index 31760e6..4b0a967 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -253,7 +253,7 @@ public interface CxfRsEndpointBuilderFactory {
          * values are possible: SimpleConsumer: This binding style processes
          * request parameters, multiparts, etc. and maps them to IN headers, IN
          * attachments and to the message body. It aims to eliminate low-level
-         * processing of org.apache.cxf.message.MessageContentsList . It also
+         * processing of org.apache.cxf.message.MessageContentsList. It also
          * also adds more flexibility and simplicity to the response mapping.
          * Only available for consumers. Default: The default style. For
          * consumers this passes on a MessageContentsList to the route,
@@ -281,7 +281,7 @@ public interface CxfRsEndpointBuilderFactory {
          * values are possible: SimpleConsumer: This binding style processes
          * request parameters, multiparts, etc. and maps them to IN headers, IN
          * attachments and to the message body. It aims to eliminate low-level
-         * processing of org.apache.cxf.message.MessageContentsList . It also
+         * processing of org.apache.cxf.message.MessageContentsList. It also
          * also adds more flexibility and simplicity to the response mapping.
          * Only available for consumers. Default: The default style. For
          * consumers this passes on a MessageContentsList to the route,
@@ -427,7 +427,23 @@ public interface CxfRsEndpointBuilderFactory {
          * want to export as REST service. Multiple beans can be separated by
          * comma.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCxfRsEndpointConsumerBuilder serviceBeans(
+                List<Object> serviceBeans) {
+            doSetProperty("serviceBeans", serviceBeans);
+            return this;
+        }
+        /**
+         * The service beans (the bean ids to lookup in the registry) which you
+         * want to export as REST service. Multiple beans can be separated by
+         * comma.
+         * 
+         * The option will be converted to a
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          * 
          * Group: consumer (advanced)
          */
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index a9bbc4d..811d035 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The dataset component provides a mechanism to easily perform load & soak
- * testing of your system. It works by allowing you to create DataSet instances
- * both as a source of messages and as a way to assert that the data set is
- * received. Camel will use the throughput logger when sending dataset's.
+ * testing of your system.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -423,7 +421,7 @@ public interface DataSetEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -446,7 +444,7 @@ public interface DataSetEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -619,21 +617,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -645,21 +642,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -671,20 +667,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -696,20 +692,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -945,10 +941,7 @@ public interface DataSetEndpointBuilderFactory {
         /**
          * Dataset (camel-dataset)
          * The dataset component provides a mechanism to easily perform load &
-         * soak testing of your system. It works by allowing you to create
-         * DataSet instances both as a source of messages and as a way to assert
-         * that the data set is received. Camel will use the throughput logger
-         * when sending dataset's.
+         * soak testing of your system.
          * 
          * Category: core,testing
          * Since: 1.3
@@ -966,10 +959,7 @@ public interface DataSetEndpointBuilderFactory {
     /**
      * Dataset (camel-dataset)
      * The dataset component provides a mechanism to easily perform load & soak
-     * testing of your system. It works by allowing you to create DataSet
-     * instances both as a source of messages and as a way to assert that the
-     * data set is received. Camel will use the throughput logger when sending
-     * dataset's.
+     * testing of your system.
      * 
      * Category: core,testing
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index 39fef19..5cf96a9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -23,13 +23,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The dataset-test component extends the mock component by on startup to pull
- * messages from another endpoint to set the expected message bodies. That is,
- * you use the test endpoint in a route and messages arriving on it will be
- * implicitly compared to some expected messages extracted from some other
- * location. So you can use, for example, an expected set of message bodies as
- * files. This will then set up a properly configured Mock endpoint, which is
- * only valid if the received messages match the number of expected messages and
- * their message payloads are equal.
+ * messages from another endpoint to set the expected message bodies.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -129,7 +123,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -152,7 +146,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -322,21 +316,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -348,21 +341,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -374,20 +366,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -399,20 +391,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -607,13 +599,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * DataSet Test (camel-dataset)
          * The dataset-test component extends the mock component by on startup
          * to pull messages from another endpoint to set the expected message
-         * bodies. That is, you use the test endpoint in a route and messages
-         * arriving on it will be implicitly compared to some expected messages
-         * extracted from some other location. So you can use, for example, an
-         * expected set of message bodies as files. This will then set up a
-         * properly configured Mock endpoint, which is only valid if the
-         * received messages match the number of expected messages and their
-         * message payloads are equal.
+         * bodies.
          * 
          * Category: core,testing
          * Since: 1.3
@@ -633,12 +619,6 @@ public interface DataSetTestEndpointBuilderFactory {
      * DataSet Test (camel-dataset)
      * The dataset-test component extends the mock component by on startup to
      * pull messages from another endpoint to set the expected message bodies.
-     * That is, you use the test endpoint in a route and messages arriving on it
-     * will be implicitly compared to some expected messages extracted from some
-     * other location. So you can use, for example, an expected set of message
-     * bodies as files. This will then set up a properly configured Mock
-     * endpoint, which is only valid if the received messages match the number
-     * of expected messages and their message payloads are equal.
      * 
      * Category: core,testing
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
similarity index 55%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index 09ae4aa..39c717f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -22,58 +22,94 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws2-translate component is used for managing Amazon Translate
+ * The aws2-ddb component is used for storing and retrieving data from Amazon's
+ * DynamoDB service.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface Translate2EndpointBuilderFactory {
+public interface Ddb2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 Translate component.
+     * Builder for endpoint for the AWS 2 DynamoDB component.
      */
-    public interface Translate2EndpointBuilder
-            extends
-                EndpointProducerBuilder {
-        default AdvancedTranslate2EndpointBuilder advanced() {
-            return (AdvancedTranslate2EndpointBuilder) this;
+    public interface Ddb2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedDdb2EndpointBuilder advanced() {
+            return (AdvancedDdb2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
+         * To use the AmazonDynamoDB as the client.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.DynamoDbClient</code>
+         * type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
+        default Ddb2EndpointBuilder amazonDDBClient(Object amazonDDBClient) {
+            doSetProperty("amazonDDBClient", amazonDDBClient);
+            return this;
+        }
+        /**
+         * To use the AmazonDynamoDB as the client.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.DynamoDbClient</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder amazonDDBClient(String amazonDDBClient) {
+            doSetProperty("amazonDDBClient", amazonDDBClient);
             return this;
         }
         /**
-         * Being able to autodetect the source language.
+         * Determines whether or not strong consistency should be enforced when
+         * data is read.
          * 
          * The option is a: <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder autodetectSourceLanguage(
-                boolean autodetectSourceLanguage) {
-            doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
+        default Ddb2EndpointBuilder consistentRead(boolean consistentRead) {
+            doSetProperty("consistentRead", consistentRead);
             return this;
         }
         /**
-         * Being able to autodetect the source language.
+         * Determines whether or not strong consistency should be enforced when
+         * data is read.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder autodetectSourceLanguage(
-                String autodetectSourceLanguage) {
-            doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
+        default Ddb2EndpointBuilder consistentRead(String consistentRead) {
+            doSetProperty("consistentRead", consistentRead);
+            return this;
+        }
+        /**
+         * Attribute name when creating table.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder keyAttributeName(String keyAttributeName) {
+            doSetProperty("keyAttributeName", keyAttributeName);
+            return this;
+        }
+        /**
+         * Attribute type when creating table.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder keyAttributeType(String keyAttributeType) {
+            doSetProperty("keyAttributeType", keyAttributeType);
             return this;
         }
         /**
@@ -92,8 +128,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
+        default Ddb2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -113,76 +148,78 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder lazyStartProducer(
-                String lazyStartProducer) {
+        default Ddb2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * The operation to perform.
+         * What operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> type.
          * 
-         * Required: true
-         * Default: translateText
+         * Default: PutItem
          * Group: producer
          */
-        default Translate2EndpointBuilder operation(
-                Translate2Operations operation) {
+        default Ddb2EndpointBuilder operation(Ddb2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * The operation to perform.
+         * What operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> type.
          * 
-         * Required: true
-         * Default: translateText
+         * Default: PutItem
          * Group: producer
          */
-        default Translate2EndpointBuilder operation(String operation) {
+        default Ddb2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the Translate client.
+         * To define a proxy host when instantiating the DDB client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyHost(String proxyHost) {
+        default Ddb2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the Translate client.
+         * 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().
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyPort(Integer proxyPort) {
+        default Ddb2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the Translate client.
+         * 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().
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyPort(String proxyPort) {
+        default Ddb2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the Translate client.
+         * To define a proxy protocol when instantiating the DDB client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -190,12 +227,12 @@ public interface Translate2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Ddb2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the Translate client.
+         * To define a proxy protocol when instantiating the DDB client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -203,91 +240,101 @@ public interface Translate2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default Ddb2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * 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().
+         * The provisioned throughput to reserve for reading resources from your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder region(String region) {
-            doSetProperty("region", region);
+        default Ddb2EndpointBuilder readCapacity(Long readCapacity) {
+            doSetProperty("readCapacity", readCapacity);
             return this;
         }
         /**
-         * Amazon AWS Secret Key.
+         * The provisioned throughput to reserve for reading resources from your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder secretKey(String secretKey) {
-            doSetProperty("secretKey", secretKey);
+        default Ddb2EndpointBuilder readCapacity(String readCapacity) {
+            doSetProperty("readCapacity", readCapacity);
             return this;
         }
         /**
-         * Source language to use.
+         * The region in which DDB client needs to work.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder sourceLanguage(String sourceLanguage) {
-            doSetProperty("sourceLanguage", sourceLanguage);
+        default Ddb2EndpointBuilder region(String region) {
+            doSetProperty("region", region);
             return this;
         }
         /**
-         * Target language to use.
+         * The provisioned throughput to reserved for writing resources to your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder targetLanguage(String targetLanguage) {
-            doSetProperty("targetLanguage", targetLanguage);
+        default Ddb2EndpointBuilder writeCapacity(Long writeCapacity) {
+            doSetProperty("writeCapacity", writeCapacity);
             return this;
         }
         /**
-         * To use a existing configured AWS Translate as client.
+         * The provisioned throughput to reserved for writing resources to your
+         * table.
          * 
-         * The option is a:
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder translateClient(Object translateClient) {
-            doSetProperty("translateClient", translateClient);
+        default Ddb2EndpointBuilder writeCapacity(String writeCapacity) {
+            doSetProperty("writeCapacity", writeCapacity);
             return this;
         }
         /**
-         * To use a existing configured AWS Translate as client.
+         * Amazon AWS Access Key.
          * 
-         * The option will be converted to a
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
-        default Translate2EndpointBuilder translateClient(String translateClient) {
-            doSetProperty("translateClient", translateClient);
+        default Ddb2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2EndpointBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS 2 Translate component.
+     * Advanced builder for endpoint for the AWS 2 DynamoDB component.
      */
-    public interface AdvancedTranslate2EndpointBuilder
+    public interface AdvancedDdb2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default Translate2EndpointBuilder basic() {
-            return (Translate2EndpointBuilder) this;
+        default Ddb2EndpointBuilder basic() {
+            return (Ddb2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -298,7 +345,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -312,7 +359,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -326,8 +373,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder synchronous(
-                boolean synchronous) {
+        default AdvancedDdb2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -340,7 +386,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedDdb2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -348,10 +394,19 @@ public interface Translate2EndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> enum.
+     * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> enum.
      */
-    enum Translate2Operations {
-        translateText;
+    enum Ddb2Operations {
+        BatchGetItems,
+        DeleteItem,
+        DeleteTable,
+        DescribeTable,
+        GetItem,
+        PutItem,
+        Query,
+        Scan,
+        UpdateItem,
+        UpdateTable;
     }
 
     /**
@@ -362,43 +417,45 @@ public interface Translate2EndpointBuilderFactory {
         https;
     }
 
-    public interface Translate2Builders {
+    public interface Ddb2Builders {
         /**
-         * AWS 2 Translate (camel-aws2-translate)
-         * The aws2-translate component is used for managing Amazon Translate
+         * AWS 2 DynamoDB (camel-aws2-ddb)
+         * The aws2-ddb component is used for storing and retrieving data from
+         * Amazon's DynamoDB service.
          * 
-         * Category: cloud,management
+         * Category: cloud,database,nosql
          * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-aws2-translate
+         * Maven coordinates: org.apache.camel:camel-aws2-ddb
          * 
-         * Syntax: <code>aws2-translate:label</code>
+         * Syntax: <code>aws2-ddb:tableName</code>
          * 
-         * Path parameter: label (required)
-         * Logical name
+         * Path parameter: tableName (required)
+         * The name of the table currently worked with.
          */
-        default Translate2EndpointBuilder aws2Translate(String path) {
-            return Translate2EndpointBuilderFactory.aws2Translate(path);
+        default Ddb2EndpointBuilder aws2Ddb(String path) {
+            return Ddb2EndpointBuilderFactory.aws2Ddb(path);
         }
     }
     /**
-     * AWS 2 Translate (camel-aws2-translate)
-     * The aws2-translate component is used for managing Amazon Translate
+     * AWS 2 DynamoDB (camel-aws2-ddb)
+     * The aws2-ddb component is used for storing and retrieving data from
+     * Amazon's DynamoDB service.
      * 
-     * Category: cloud,management
+     * Category: cloud,database,nosql
      * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-aws2-translate
+     * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
-     * Syntax: <code>aws2-translate:label</code>
+     * Syntax: <code>aws2-ddb:tableName</code>
      * 
-     * Path parameter: label (required)
-     * Logical name
+     * Path parameter: tableName (required)
+     * The name of the table currently worked with.
      */
-    static Translate2EndpointBuilder aws2Translate(String path) {
-        class Translate2EndpointBuilderImpl extends AbstractEndpointBuilder implements Translate2EndpointBuilder, AdvancedTranslate2EndpointBuilder {
-            public Translate2EndpointBuilderImpl(String path) {
-                super("aws2-translate", path);
+    static Ddb2EndpointBuilder aws2Ddb(String path) {
+        class Ddb2EndpointBuilderImpl extends AbstractEndpointBuilder implements Ddb2EndpointBuilder, AdvancedDdb2EndpointBuilder {
+            public Ddb2EndpointBuilderImpl(String path) {
+                super("aws2-ddb", path);
             }
         }
-        return new Translate2EndpointBuilderImpl(path);
+        return new Ddb2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
similarity index 65%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index 7839287..80ea1e7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -29,44 +29,48 @@ import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
- * Consumer endpoint to receive from PostgreSQL Replication Slot.
+ * The aws2-ddbstream component is used for working with Amazon DynamoDB
+ * Streams.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface PgReplicationSlotEndpointBuilderFactory {
+public interface Ddb2StreamEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the PostgresSQL Replication Slot component.
+     * Builder for endpoint for the AWS 2 DynamoDB Streams component.
      */
-    public interface PgReplicationSlotEndpointBuilder
+    public interface Ddb2StreamEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default AdvancedPgReplicationSlotEndpointBuilder advanced() {
-            return (AdvancedPgReplicationSlotEndpointBuilder) this;
+        default AdvancedDdb2StreamEndpointBuilder advanced() {
+            return (AdvancedDdb2StreamEndpointBuilder) this;
         }
         /**
-         * PostgreSQL password.
+         * Amazon DynamoDB client to use for all requests for this endpoint.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient</code> type.
          * 
-         * Group: common
+         * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder password(String password) {
-            doSetProperty("password", password);
+        default Ddb2StreamEndpointBuilder amazonDynamoDbStreamsClient(
+                Object amazonDynamoDbStreamsClient) {
+            doSetProperty("amazonDynamoDbStreamsClient", amazonDynamoDbStreamsClient);
             return this;
         }
         /**
-         * PostgreSQL username.
+         * Amazon DynamoDB client to use for all requests for this endpoint.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient</code> type.
          * 
-         * Default: postgres
-         * Group: common
+         * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder user(String user) {
-            doSetProperty("user", user);
+        default Ddb2StreamEndpointBuilder amazonDynamoDbStreamsClient(
+                String amazonDynamoDbStreamsClient) {
+            doSetProperty("amazonDynamoDbStreamsClient", amazonDynamoDbStreamsClient);
             return this;
         }
         /**
@@ -83,7 +87,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder bridgeErrorHandler(
+        default Ddb2StreamEndpointBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -102,12 +106,140 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder bridgeErrorHandler(
+        default Ddb2StreamEndpointBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
+         * 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.
+         * 
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> type.
+         * 
+         * Default: LATEST
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder iteratorType(
+                ShardIteratorType iteratorType) {
+            doSetProperty("iteratorType", iteratorType);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> type.
+         * 
+         * Default: LATEST
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder iteratorType(String iteratorType) {
+            doSetProperty("iteratorType", iteratorType);
+            return this;
+        }
+        /**
+         * Maximum number of records that will be fetched in each poll.
+         * 
+         * The option is a: <code>int</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder maxResultsPerRequest(
+                int maxResultsPerRequest) {
+            doSetProperty("maxResultsPerRequest", maxResultsPerRequest);
+            return this;
+        }
+        /**
+         * Maximum number of records that will be fetched in each poll.
+         * 
+         * The option will be converted to a <code>int</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder maxResultsPerRequest(
+                String maxResultsPerRequest) {
+            doSetProperty("maxResultsPerRequest", maxResultsPerRequest);
+            return this;
+        }
+        /**
+         * To define a proxy host when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the DDBStreams client.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy protocol when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
+         * type.
+         * 
+         * Default: HTTPS
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+            doSetProperty("proxyProtocol", proxyProtocol);
+            return this;
+        }
+        /**
+         * To define a proxy protocol when instantiating the DDBStreams client.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.core.Protocol</code> type.
+         * 
+         * Default: HTTPS
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyProtocol(String proxyProtocol) {
+            doSetProperty("proxyProtocol", proxyProtocol);
+            return this;
+        }
+        /**
+         * The region in which DDBStreams client needs to work.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder region(String region) {
+            doSetProperty("region", region);
+            return this;
+        }
+        /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead.
          * 
@@ -116,7 +248,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder sendEmptyMessageWhenIdle(
+        default Ddb2StreamEndpointBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -130,12 +262,42 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder sendEmptyMessageWhenIdle(
+        default Ddb2StreamEndpointBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
         }
         /**
+         * 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.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder sequenceNumberProvider(
+                Object sequenceNumberProvider) {
+            doSetProperty("sequenceNumberProvider", sequenceNumberProvider);
+            return this;
+        }
+        /**
+         * 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.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder sequenceNumberProvider(
+                String sequenceNumberProvider) {
+            doSetProperty("sequenceNumberProvider", sequenceNumberProvider);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -143,7 +305,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffErrorThreshold(
+        default Ddb2StreamEndpointBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -156,7 +318,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffErrorThreshold(
+        default Ddb2StreamEndpointBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -169,7 +331,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffIdleThreshold(
+        default Ddb2StreamEndpointBuilder backoffIdleThreshold(
                 int backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -182,7 +344,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffIdleThreshold(
+        default Ddb2StreamEndpointBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -199,7 +361,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffMultiplier(
+        default Ddb2StreamEndpointBuilder backoffMultiplier(
                 int backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -216,7 +378,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffMultiplier(
+        default Ddb2StreamEndpointBuilder backoffMultiplier(
                 String backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -231,7 +393,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder delay(long delay) {
+        default Ddb2StreamEndpointBuilder delay(long delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -245,7 +407,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder delay(String delay) {
+        default Ddb2StreamEndpointBuilder delay(String delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -258,7 +420,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder greedy(boolean greedy) {
+        default Ddb2StreamEndpointBuilder greedy(boolean greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -271,7 +433,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder greedy(String greedy) {
+        default Ddb2StreamEndpointBuilder greedy(String greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -285,7 +447,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder initialDelay(long initialDelay) {
+        default Ddb2StreamEndpointBuilder initialDelay(long initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -299,8 +461,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder initialDelay(
-                String initialDelay) {
+        default Ddb2StreamEndpointBuilder initialDelay(String initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -314,7 +475,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder repeatCount(long repeatCount) {
+        default Ddb2StreamEndpointBuilder repeatCount(long repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -328,7 +489,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder repeatCount(String repeatCount) {
+        default Ddb2StreamEndpointBuilder repeatCount(String repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -341,7 +502,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder runLoggingLevel(
+        default Ddb2StreamEndpointBuilder runLoggingLevel(
                 LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -356,8 +517,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder runLoggingLevel(
-                String runLoggingLevel) {
+        default Ddb2StreamEndpointBuilder runLoggingLevel(String runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -371,7 +531,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduledExecutorService(
+        default Ddb2StreamEndpointBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -386,7 +546,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduledExecutorService(
+        default Ddb2StreamEndpointBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -400,7 +560,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: none
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduler(String scheduler) {
+        default Ddb2StreamEndpointBuilder scheduler(String scheduler) {
             doSetProperty("scheduler", scheduler);
             return this;
         }
@@ -413,7 +573,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder schedulerProperties(
+        default Ddb2StreamEndpointBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -428,7 +588,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder schedulerProperties(
+        default Ddb2StreamEndpointBuilder schedulerProperties(
                 String schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -441,8 +601,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder startScheduler(
-                boolean startScheduler) {
+        default Ddb2StreamEndpointBuilder startScheduler(boolean startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -454,8 +613,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder startScheduler(
-                String startScheduler) {
+        default Ddb2StreamEndpointBuilder startScheduler(String startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -467,7 +625,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder timeUnit(TimeUnit timeUnit) {
+        default Ddb2StreamEndpointBuilder timeUnit(TimeUnit timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -480,7 +638,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder timeUnit(String timeUnit) {
+        default Ddb2StreamEndpointBuilder timeUnit(String timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -493,8 +651,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder useFixedDelay(
-                boolean useFixedDelay) {
+        default Ddb2StreamEndpointBuilder useFixedDelay(boolean useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -507,22 +664,42 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder useFixedDelay(
-                String useFixedDelay) {
+        default Ddb2StreamEndpointBuilder useFixedDelay(String useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2StreamEndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2StreamEndpointBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
+            return this;
+        }
     }
 
     /**
-     * Advanced builder for endpoint for the PostgresSQL Replication Slot
-     * component.
+     * Advanced builder for endpoint for the AWS 2 DynamoDB Streams component.
      */
-    public interface AdvancedPgReplicationSlotEndpointBuilder
+    public interface AdvancedDdb2StreamEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default PgReplicationSlotEndpointBuilder basic() {
-            return (PgReplicationSlotEndpointBuilder) this;
+        default Ddb2StreamEndpointBuilder basic() {
+            return (Ddb2StreamEndpointBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -535,7 +712,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exceptionHandler(
+        default AdvancedDdb2StreamEndpointBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -551,7 +728,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exceptionHandler(
+        default AdvancedDdb2StreamEndpointBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -563,7 +740,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exchangePattern(
+        default AdvancedDdb2StreamEndpointBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -576,7 +753,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exchangePattern(
+        default AdvancedDdb2StreamEndpointBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -592,7 +769,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder pollStrategy(
+        default AdvancedDdb2StreamEndpointBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -608,39 +785,12 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder pollStrategy(
+        default AdvancedDdb2StreamEndpointBuilder pollStrategy(
                 String pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
         /**
-         * Auto create slot if it does not exist.
-         * 
-         * The option is a: <code>java.lang.Boolean</code> type.
-         * 
-         * Default: true
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder autoCreateSlot(
-                Boolean autoCreateSlot) {
-            doSetProperty("autoCreateSlot", autoCreateSlot);
-            return this;
-        }
-        /**
-         * Auto create slot if it does not exist.
-         * 
-         * The option will be converted to a <code>java.lang.Boolean</code>
-         * type.
-         * 
-         * Default: true
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder autoCreateSlot(
-                String autoCreateSlot) {
-            doSetProperty("autoCreateSlot", autoCreateSlot);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -649,7 +799,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2StreamEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -663,68 +813,12 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2StreamEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
         }
         /**
-         * Slot options to be passed to the output plugin.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.Object&gt;</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder slotOptions(
-                Map<String, Object> slotOptions) {
-            doSetProperty("slotOptions", slotOptions);
-            return this;
-        }
-        /**
-         * Slot options to be passed to the output plugin.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
-         * type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder slotOptions(
-                String slotOptions) {
-            doSetProperty("slotOptions", slotOptions);
-            return this;
-        }
-        /**
-         * Specifies the number of seconds between status packets sent back to
-         * Postgres server.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 10
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder statusInterval(
-                Integer statusInterval) {
-            doSetProperty("statusInterval", statusInterval);
-            return this;
-        }
-        /**
-         * Specifies the number of seconds between status packets sent back to
-         * Postgres server.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 10
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder statusInterval(
-                String statusInterval) {
-            doSetProperty("statusInterval", statusInterval);
-            return this;
-        }
-        /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported).
          * 
@@ -733,7 +827,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder synchronous(
+        default AdvancedDdb2StreamEndpointBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -747,80 +841,71 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder synchronous(
-                String synchronous) {
+        default AdvancedDdb2StreamEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface PgReplicationSlotBuilders {
+    /**
+     * Proxy enum for
+     * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> enum.
+     */
+    enum ShardIteratorType {
+        TRIM_HORIZON,
+        LATEST,
+        AT_SEQUENCE_NUMBER,
+        AFTER_SEQUENCE_NUMBER,
+        null;
+    }
+
+    /**
+     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
+     */
+    enum Protocol {
+        http,
+        https;
+    }
+
+    public interface Ddb2StreamBuilders {
         /**
-         * PostgresSQL Replication Slot (camel-pg-replication-slot)
-         * Consumer endpoint to receive from PostgreSQL Replication Slot.
-         * 
-         * Category: database,sql
-         * Since: 3.0
-         * Maven coordinates: org.apache.camel:camel-pg-replication-slot
-         * 
-         * Syntax:
-         * <code>pg-replication-slot:host:port/database/slot:outputPlugin</code>
-         * 
-         * Path parameter: slot (required)
-         * Replication Slot name
+         * AWS 2 DynamoDB Streams (camel-aws2-ddb)
+         * The aws2-ddbstream component is used for working with Amazon DynamoDB
+         * Streams.
          * 
-         * Path parameter: host
-         * PostgreSQL server host
-         * Default value: localhost
+         * Category: cloud,messaging,streams
+         * Since: 3.1
+         * Maven coordinates: org.apache.camel:camel-aws2-ddb
          * 
-         * Path parameter: port
-         * PostgreSQL server port
-         * Default value: 5432
+         * Syntax: <code>aws2-ddbstream:tableName</code>
          * 
-         * Path parameter: database (required)
-         * PostgreSQL database name
-         * 
-         * Path parameter: outputPlugin (required)
-         * Output plugin name
+         * Path parameter: tableName (required)
+         * Name of the dynamodb table
          */
-        default PgReplicationSlotEndpointBuilder pgReplicationSlot(String path) {
-            return PgReplicationSlotEndpointBuilderFactory.pgReplicationSlot(path);
+        default Ddb2StreamEndpointBuilder aws2Ddbstream(String path) {
+            return Ddb2StreamEndpointBuilderFactory.aws2Ddbstream(path);
         }
     }
     /**
-     * PostgresSQL Replication Slot (camel-pg-replication-slot)
-     * Consumer endpoint to receive from PostgreSQL Replication Slot.
-     * 
-     * Category: database,sql
-     * Since: 3.0
-     * Maven coordinates: org.apache.camel:camel-pg-replication-slot
-     * 
-     * Syntax:
-     * <code>pg-replication-slot:host:port/database/slot:outputPlugin</code>
-     * 
-     * Path parameter: slot (required)
-     * Replication Slot name
-     * 
-     * Path parameter: host
-     * PostgreSQL server host
-     * Default value: localhost
+     * AWS 2 DynamoDB Streams (camel-aws2-ddb)
+     * The aws2-ddbstream component is used for working with Amazon DynamoDB
+     * Streams.
      * 
-     * Path parameter: port
-     * PostgreSQL server port
-     * Default value: 5432
+     * Category: cloud,messaging,streams
+     * Since: 3.1
+     * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
-     * Path parameter: database (required)
-     * PostgreSQL database name
+     * Syntax: <code>aws2-ddbstream:tableName</code>
      * 
-     * Path parameter: outputPlugin (required)
-     * Output plugin name
+     * Path parameter: tableName (required)
+     * Name of the dynamodb table
      */
-    static PgReplicationSlotEndpointBuilder pgReplicationSlot(String path) {
-        class PgReplicationSlotEndpointBuilderImpl extends AbstractEndpointBuilder implements PgReplicationSlotEndpointBuilder, AdvancedPgReplicationSlotEndpointBuilder {
-            public PgReplicationSlotEndpointBuilderImpl(String path) {
-                super("pg-replication-slot", path);
+    static Ddb2StreamEndpointBuilder aws2Ddbstream(String path) {
+        class Ddb2StreamEndpointBuilderImpl extends AbstractEndpointBuilder implements Ddb2StreamEndpointBuilder, AdvancedDdb2StreamEndpointBuilder {
+            public Ddb2StreamEndpointBuilderImpl(String path) {
+                super("aws2-ddbstream", path);
             }
         }
-        return new PgReplicationSlotEndpointBuilderImpl(path);
+        return new Ddb2StreamEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
index 3ee7170..bc6dc08 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
@@ -25,8 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The direct component provides direct, synchronous call to another endpoint
- * from the same CamelContext. This endpoint can be used to connect existing
- * routes in the same CamelContext.
+ * from the same CamelContext.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -489,8 +488,7 @@ public interface DirectEndpointBuilderFactory {
         /**
          * Direct (camel-direct)
          * The direct component provides direct, synchronous call to another
-         * endpoint from the same CamelContext. This endpoint can be used to
-         * connect existing routes in the same CamelContext.
+         * endpoint from the same CamelContext.
          * 
          * Category: core,endpoint
          * Since: 1.0
@@ -508,8 +506,7 @@ public interface DirectEndpointBuilderFactory {
     /**
      * Direct (camel-direct)
      * The direct component provides direct, synchronous call to another
-     * endpoint from the same CamelContext. This endpoint can be used to connect
-     * existing routes in the same CamelContext.
+     * endpoint from the same CamelContext.
      * 
      * Category: core,endpoint
      * Since: 1.0
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
index cf30473..29a941f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
@@ -26,8 +26,7 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * The direct-vm component provides direct, synchronous call to another endpoint
- * from any CamelContext in the same JVM. This endpoint can be used to connect
- * existing routes in the same JVM between different CamelContexts.
+ * from any CamelContext in the same JVM.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -604,9 +603,7 @@ public interface DirectVmEndpointBuilderFactory {
         /**
          * Direct VM (camel-directvm)
          * The direct-vm component provides direct, synchronous call to another
-         * endpoint from any CamelContext in the same JVM. This endpoint can be
-         * used to connect existing routes in the same JVM between different
-         * CamelContexts.
+         * endpoint from any CamelContext in the same JVM.
          * 
          * Category: core,endpoint
          * Since: 2.10
@@ -624,9 +621,7 @@ public interface DirectVmEndpointBuilderFactory {
     /**
      * Direct VM (camel-directvm)
      * The direct-vm component provides direct, synchronous call to another
-     * endpoint from any CamelContext in the same JVM. This endpoint can be used
-     * to connect existing routes in the same JVM between different
-     * CamelContexts.
+     * endpoint from any CamelContext in the same JVM.
      * 
      * Category: core,endpoint
      * Since: 2.10
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
index d631f83..86cf1d2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The disruptor component provides asynchronous SEDA behavior using LMAX
- * Disruptor. This component works much as the standard SEDA Component, but
- * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
- * SEDA.
+ * Disruptor.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -759,9 +757,7 @@ public interface DisruptorEndpointBuilderFactory {
         /**
          * Disruptor (camel-disruptor)
          * The disruptor component provides asynchronous SEDA behavior using
-         * LMAX Disruptor. This component works much as the standard SEDA
-         * Component, but utilizes a Disruptor instead of a BlockingQueue
-         * utilized by the standard SEDA.
+         * LMAX Disruptor.
          * 
          * Category: endpoint
          * Since: 2.12
@@ -779,9 +775,7 @@ public interface DisruptorEndpointBuilderFactory {
     /**
      * Disruptor (camel-disruptor)
      * The disruptor component provides asynchronous SEDA behavior using LMAX
-     * Disruptor. This component works much as the standard SEDA Component, but
-     * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
-     * SEDA.
+     * Disruptor.
      * 
      * Category: endpoint
      * Since: 2.12
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
index e39a773..5017dcf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The disruptor component provides asynchronous SEDA behavior using LMAX
- * Disruptor. This component works much as the standard SEDA Component, but
- * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
- * SEDA.
+ * Disruptor.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -761,9 +759,7 @@ public interface DisruptorVmEndpointBuilderFactory {
         /**
          * Disruptor VM (camel-disruptor)
          * The disruptor component provides asynchronous SEDA behavior using
-         * LMAX Disruptor. This component works much as the standard SEDA
-         * Component, but utilizes a Disruptor instead of a BlockingQueue
-         * utilized by the standard SEDA.
+         * LMAX Disruptor.
          * 
          * Category: endpoint
          * Since: 2.12
@@ -781,9 +777,7 @@ public interface DisruptorVmEndpointBuilderFactory {
     /**
      * Disruptor VM (camel-disruptor)
      * The disruptor component provides asynchronous SEDA behavior using LMAX
-     * Disruptor. This component works much as the standard SEDA Component, but
-     * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
-     * SEDA.
+     * Disruptor.
      * 
      * Category: endpoint
      * Since: 2.12
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 5987a64..e0baeab 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
@@ -451,6 +452,33 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointConsumerBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointConsumerBuilder parameters(
+                String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -883,6 +911,33 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointProducerBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointProducerBuilder parameters(
+                String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1272,6 +1327,32 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointBuilder parameters(String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 66349c6..0087458 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -51,7 +51,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * Drill directory in ZooKeeper.
+         * Drill directory.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -132,7 +132,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * ZooKeeper port number.
+         * Port number.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
@@ -144,7 +144,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * ZooKeeper port number.
+         * Port number.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
@@ -245,8 +245,7 @@ public interface DrillEndpointBuilderFactory {
          * Syntax: <code>drill:host</code>
          * 
          * Path parameter: host (required)
-         * ZooKeeper host name or IP address. Use local instead of a host name
-         * or IP address to connect to the local Drillbit
+         * Host name or IP address
          */
         default DrillEndpointBuilder drill(String path) {
             return DrillEndpointBuilderFactory.drill(path);
@@ -264,8 +263,7 @@ public interface DrillEndpointBuilderFactory {
      * Syntax: <code>drill:host</code>
      * 
      * Path parameter: host (required)
-     * ZooKeeper host name or IP address. Use local instead of a host name or IP
-     * address to connect to the local Drillbit
+     * Host name or IP address
      */
     static DrillEndpointBuilder drill(String path) {
         class DrillEndpointBuilderImpl extends AbstractEndpointBuilder implements DrillEndpointBuilder, AdvancedDrillEndpointBuilder {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index 4ffd4f3..d6fde27 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -204,10 +204,10 @@ public interface EC2EndpointBuilderFactory {
             return this;
         }
         /**
-         * The region in which EC2 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().
+         * 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().
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index 6533ce9..075357c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -38,17 +38,6 @@ public interface ECS2EndpointBuilderFactory {
             return (AdvancedECS2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default ECS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
          * To use a existing configured AWS ECS as client.
          * 
          * The option is a:
@@ -213,11 +202,22 @@ public interface ECS2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default ECS2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
          * Amazon AWS Secret Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
         default ECS2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index e3b210d..dd07412 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-eks is used for managing Amazon EKS
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -38,17 +38,6 @@ public interface EKS2EndpointBuilderFactory {
             return (AdvancedEKS2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
          * To use a existing configured AWS EKS as client.
          * 
          * The option is a:
@@ -213,11 +202,22 @@ public interface EKS2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EKS2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
          * Amazon AWS Secret Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
         default EKS2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
@@ -312,7 +312,7 @@ public interface EKS2EndpointBuilderFactory {
     public interface EKS2Builders {
         /**
          * AWS 2 EKS (camel-aws2-eks)
-         * The aws-eks is used for managing Amazon EKS
+         * The aws2-eks is used for managing Amazon EKS
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -329,7 +329,7 @@ public interface EKS2EndpointBuilderFactory {
     }
     /**
      * AWS 2 EKS (camel-aws2-eks)
-     * The aws-eks is used for managing Amazon EKS
+     * The aws2-eks is used for managing Amazon EKS
      * 
      * Category: cloud,management
      * Since: 3.1
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 1e29048..21e142f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -141,6 +141,29 @@ public interface ElasticsearchEndpointBuilderFactory {
             return this;
         }
         /**
+         * Starting index of the response.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder from(Integer from) {
+            doSetProperty("from", from);
+            return this;
+        }
+        /**
+         * Starting index of the response.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder from(String from) {
+            doSetProperty("from", from);
+            return this;
+        }
+        /**
          * Comma separated list with ip:port formatted remote transport
          * addresses to use.
          * 
@@ -283,6 +306,29 @@ public interface ElasticsearchEndpointBuilderFactory {
             return this;
         }
         /**
+         * Size of the response.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder size(Integer size) {
+            doSetProperty("size", size);
+            return this;
+        }
+        /**
+         * Size of the response.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder size(String size) {
+            doSetProperty("size", size);
+            return this;
+        }
+        /**
          * The delay of a sniff execution scheduled after a failure (in
          * milliseconds).
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
index 675ad5e..bc96774 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
@@ -57,12 +57,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -75,12 +75,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
@@ -255,9 +255,9 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * if true , the consumer will post notifications to the route when a
-         * new WebSocket peer connects, disconnects, etc. See
-         * UndertowConstants.EVENT_TYPE and EventType .
+         * if true, the consumer will post notifications to the route when a new
+         * WebSocket peer connects, disconnects, etc. See
+         * UndertowConstants.EVENT_TYPE and EventType.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -270,9 +270,9 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * if true , the consumer will post notifications to the route when a
-         * new WebSocket peer connects, disconnects, etc. See
-         * UndertowConstants.EVENT_TYPE and EventType .
+         * if true, the consumer will post notifications to the route when a new
+         * WebSocket peer connects, disconnects, etc. See
+         * UndertowConstants.EVENT_TYPE and EventType.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -379,12 +379,13 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies a comma-delimited set of Undertow HttpHandler instances to
-         * lookup in your Registry. These handlers are added to the Undertow
-         * handler chain (for example, to add security). Important: You can not
-         * use different handlers with different Undertow endpoints using the
-         * same port number. The handlers is associated to the port number. If
-         * you need different handlers, then use different port numbers.
+         * Specifies a comma-delimited set of io.undertow.server.HttpHandler
+         * instances to lookup in your Registry. These handlers are added to the
+         * Undertow handler chain (for example, to add security). Important: You
+         * can not use different handlers with different Undertow endpoints
+         * using the same port number. The handlers is associated to the port
+         * number. If you need different handlers, then use different port
+         * numbers.
          * 
          * The option is a:
          * <code>java.util.Set&lt;org.apache.camel.component.undertow.HttpHandlerRegistrationInfo&gt;</code> type.
@@ -397,12 +398,13 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies a comma-delimited set of Undertow HttpHandler instances to
-         * lookup in your Registry. These handlers are added to the Undertow
-         * handler chain (for example, to add security). Important: You can not
-         * use different handlers with different Undertow endpoints using the
-         * same port number. The handlers is associated to the port number. If
-         * you need different handlers, then use different port numbers.
+         * Specifies a comma-delimited set of io.undertow.server.HttpHandler
+         * instances to lookup in your Registry. These handlers are added to the
+         * Undertow handler chain (for example, to add security). Important: You
+         * can not use different handlers with different Undertow endpoints
+         * using the same port number. The handlers is associated to the port
+         * number. If you need different handlers, then use different port
+         * numbers.
          * 
          * The option will be converted to a
          * <code>java.util.Set&lt;org.apache.camel.component.undertow.HttpHandlerRegistrationInfo&gt;</code> type.
@@ -580,12 +582,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -598,12 +600,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
@@ -710,7 +712,7 @@ public interface ElytronEndpointBuilderFactory {
         }
         /**
          * Sets additional channel options. The options that can be used are
-         * defined in org.xnio.Options . To configure from endpoint uri, then
+         * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192.
          * 
@@ -726,7 +728,7 @@ public interface ElytronEndpointBuilderFactory {
         }
         /**
          * Sets additional channel options. The options that can be used are
-         * defined in org.xnio.Options . To configure from endpoint uri, then
+         * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192.
          * 
@@ -1159,12 +1161,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -1177,12 +1179,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
similarity index 54%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
index 98518bb..9074bd1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
@@ -22,209 +22,214 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The camel-weka component provides Data Mining functionality through Weka.
+ * Camel Etcd support
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface WekaEndpointBuilderFactory {
+public interface EtcdKeysEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the Weka component.
+     * Builder for endpoint for the Etcd Keys component.
      */
-    public interface WekaEndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedWekaEndpointBuilder advanced() {
-            return (AdvancedWekaEndpointBuilder) this;
+    public interface EtcdKeysEndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedEtcdKeysEndpointBuilder advanced() {
+            return (AdvancedEtcdKeysEndpointBuilder) this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. 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
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
+         * To apply an action recursively.
          * 
          * The option is a: <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default WekaEndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
+        default EtcdKeysEndpointBuilder recursive(boolean recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. 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
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
+         * To apply an action recursively.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default WekaEndpointBuilder lazyStartProducer(String lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
+        default EtcdKeysEndpointBuilder recursive(String recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The filter spec (i.e. Name Options).
+         * The path to look for for service discovery.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: filter
+         * Default: /services/
+         * Group: producer
          */
-        default WekaEndpointBuilder apply(String apply) {
-            doSetProperty("apply", apply);
+        default EtcdKeysEndpointBuilder servicePath(String servicePath) {
+            doSetProperty("servicePath", servicePath);
             return this;
         }
         /**
-         * The classifier spec (i.e. Name Options).
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder build(String build) {
-            doSetProperty("build", build);
+        default EtcdKeysEndpointBuilder timeout(Long timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * The named dataset to train the classifier with.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder dsname(String dsname) {
-            doSetProperty("dsname", dsname);
+        default EtcdKeysEndpointBuilder timeout(String timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * Numer of folds to use for cross-validation.
+         * To set the URIs the client connects.
          * 
-         * The option is a: <code>int</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: 10
-         * Group: model
+         * Default: http://localhost:2379,http://localhost:4001
+         * Group: common
          */
-        default WekaEndpointBuilder folds(int folds) {
-            doSetProperty("folds", folds);
+        default EtcdKeysEndpointBuilder uris(String uris) {
+            doSetProperty("uris", uris);
             return this;
         }
         /**
-         * Numer of folds to use for cross-validation.
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. 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
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
          * 
-         * The option will be converted to a <code>int</code> type.
+         * The option is a: <code>boolean</code> type.
          * 
-         * Default: 10
-         * Group: model
+         * Default: false
+         * Group: producer
          */
-        default WekaEndpointBuilder folds(String folds) {
-            doSetProperty("folds", folds);
+        default EtcdKeysEndpointBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * Path to load the model from.
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. 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
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
-         * Group: model
+         * Default: false
+         * Group: producer
          */
-        default WekaEndpointBuilder loadFrom(String loadFrom) {
-            doSetProperty("loadFrom", loadFrom);
+        default EtcdKeysEndpointBuilder lazyStartProducer(
+                String lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * Path to save the model to.
+         * To set the lifespan of a key in milliseconds.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Integer</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder saveTo(String saveTo) {
-            doSetProperty("saveTo", saveTo);
+        default EtcdKeysEndpointBuilder timeToLive(Integer timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
-         * An optional seed for the randomizer.
+         * To set the lifespan of a key in milliseconds.
          * 
-         * The option is a: <code>int</code> type.
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
          * 
-         * Default: 1
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder seed(int seed) {
-            doSetProperty("seed", seed);
+        default EtcdKeysEndpointBuilder timeToLive(String timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
-         * An optional seed for the randomizer.
+         * The password to use for basic authentication.
          * 
-         * The option will be converted to a <code>int</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: 1
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder seed(String seed) {
-            doSetProperty("seed", seed);
+        default EtcdKeysEndpointBuilder password(String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
-         * Flag on whether to use cross-validation with the current dataset.
+         * To configure security using SSLContextParameters.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          * 
-         * Default: false
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder xval(boolean xval) {
-            doSetProperty("xval", xval);
+        default EtcdKeysEndpointBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
         /**
-         * Flag on whether to use cross-validation with the current dataset.
+         * To configure security using SSLContextParameters.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          * 
-         * Default: false
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder xval(String xval) {
-            doSetProperty("xval", xval);
+        default EtcdKeysEndpointBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
         /**
-         * An in/out path for the read/write commands.
+         * The user name to use for basic authentication.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: write
+         * Group: security
          */
-        default WekaEndpointBuilder path(String path) {
-            doSetProperty("path", path);
+        default EtcdKeysEndpointBuilder userName(String userName) {
+            doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Weka component.
+     * Advanced builder for endpoint for the Etcd Keys component.
      */
-    public interface AdvancedWekaEndpointBuilder
+    public interface AdvancedEtcdKeysEndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default WekaEndpointBuilder basic() {
-            return (WekaEndpointBuilder) this;
+        default EtcdKeysEndpointBuilder basic() {
+            return (EtcdKeysEndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -235,7 +240,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdKeysEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -249,7 +254,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdKeysEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -263,7 +268,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedEtcdKeysEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -276,53 +281,49 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder synchronous(String synchronous) {
+        default AdvancedEtcdKeysEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface WekaBuilders {
+    public interface EtcdKeysBuilders {
         /**
-         * Weka (camel-weka)
-         * The camel-weka component provides Data Mining functionality through
-         * Weka.
+         * Etcd Keys (camel-etcd)
+         * Camel Etcd support
          * 
-         * Category: Datamining
-         * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-weka
+         * Category: clustering,database
+         * Since: 2.18
+         * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>weka:command</code>
+         * Syntax: <code>etcd-keys:path</code>
          * 
-         * Path parameter: command (required)
-         * The command to use.
-         * The value can be one of: filter, model, read, write, push, pop,
-         * version
+         * Path parameter: path
+         * The path the endpoint refers to
          */
-        default WekaEndpointBuilder weka(String path) {
-            return WekaEndpointBuilderFactory.weka(path);
+        default EtcdKeysEndpointBuilder etcdKeys(String path) {
+            return EtcdKeysEndpointBuilderFactory.etcdKeys(path);
         }
     }
     /**
-     * Weka (camel-weka)
-     * The camel-weka component provides Data Mining functionality through Weka.
+     * Etcd Keys (camel-etcd)
+     * Camel Etcd support
      * 
-     * Category: Datamining
-     * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-weka
+     * Category: clustering,database
+     * Since: 2.18
+     * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>weka:command</code>
+     * Syntax: <code>etcd-keys:path</code>
      * 
-     * Path parameter: command (required)
-     * The command to use.
-     * The value can be one of: filter, model, read, write, push, pop, version
+     * Path parameter: path
+     * The path the endpoint refers to
      */
-    static WekaEndpointBuilder weka(String path) {
-        class WekaEndpointBuilderImpl extends AbstractEndpointBuilder implements WekaEndpointBuilder, AdvancedWekaEndpointBuilder {
-            public WekaEndpointBuilderImpl(String path) {
-                super("weka", path);
+    static EtcdKeysEndpointBuilder etcdKeys(String path) {
+        class EtcdKeysEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdKeysEndpointBuilder, AdvancedEtcdKeysEndpointBuilder {
+            public EtcdKeysEndpointBuilderImpl(String path) {
+                super("etcd-keys", path);
             }
         }
-        return new WekaEndpointBuilderImpl(path);
+        return new EtcdKeysEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
similarity index 81%
rename from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
rename to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
index 1b5b115..2333bea 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
@@ -35,17 +35,17 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EtcdEndpointBuilderFactory {
+public interface EtcdStatsEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint consumers for the Etcd component.
+     * Builder for endpoint consumers for the Etcd Stats component.
      */
-    public interface EtcdEndpointConsumerBuilder
+    public interface EtcdStatsEndpointConsumerBuilder
             extends
                 EndpointConsumerBuilder {
-        default AdvancedEtcdEndpointConsumerBuilder advanced() {
-            return (AdvancedEtcdEndpointConsumerBuilder) this;
+        default AdvancedEtcdStatsEndpointConsumerBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointConsumerBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -55,7 +55,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointConsumerBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -67,7 +67,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder recursive(String recursive) {
+        default EtcdStatsEndpointConsumerBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -79,7 +79,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointConsumerBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -90,7 +90,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointConsumerBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -101,7 +101,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder timeout(String timeout) {
+        default EtcdStatsEndpointConsumerBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -113,7 +113,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder uris(String uris) {
+        default EtcdStatsEndpointConsumerBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -131,7 +131,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder bridgeErrorHandler(
+        default EtcdStatsEndpointConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -150,7 +150,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder bridgeErrorHandler(
+        default EtcdStatsEndpointConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -163,7 +163,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
                 boolean sendEmptyExchangeOnTimeout) {
             doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
@@ -176,7 +176,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
                 String sendEmptyExchangeOnTimeout) {
             doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
@@ -190,7 +190,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -204,7 +204,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -217,7 +217,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffErrorThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -230,7 +230,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffErrorThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -243,7 +243,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffIdleThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffIdleThreshold(
                 int backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -256,7 +256,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffIdleThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -273,7 +273,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffMultiplier(
+        default EtcdStatsEndpointConsumerBuilder backoffMultiplier(
                 int backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -290,7 +290,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffMultiplier(
+        default EtcdStatsEndpointConsumerBuilder backoffMultiplier(
                 String backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -305,7 +305,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder delay(long delay) {
+        default EtcdStatsEndpointConsumerBuilder delay(long delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -319,7 +319,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder delay(String delay) {
+        default EtcdStatsEndpointConsumerBuilder delay(String delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -332,7 +332,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder greedy(boolean greedy) {
+        default EtcdStatsEndpointConsumerBuilder greedy(boolean greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -345,7 +345,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder greedy(String greedy) {
+        default EtcdStatsEndpointConsumerBuilder greedy(String greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -359,7 +359,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder initialDelay(long initialDelay) {
+        default EtcdStatsEndpointConsumerBuilder initialDelay(long initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -373,7 +373,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder initialDelay(String initialDelay) {
+        default EtcdStatsEndpointConsumerBuilder initialDelay(
+                String initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -387,7 +388,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder repeatCount(long repeatCount) {
+        default EtcdStatsEndpointConsumerBuilder repeatCount(long repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -401,7 +402,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder repeatCount(String repeatCount) {
+        default EtcdStatsEndpointConsumerBuilder repeatCount(String repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -414,7 +415,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder runLoggingLevel(
+        default EtcdStatsEndpointConsumerBuilder runLoggingLevel(
                 LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -429,7 +430,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder runLoggingLevel(
+        default EtcdStatsEndpointConsumerBuilder runLoggingLevel(
                 String runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -444,7 +445,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduledExecutorService(
+        default EtcdStatsEndpointConsumerBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -459,7 +460,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduledExecutorService(
+        default EtcdStatsEndpointConsumerBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -473,7 +474,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: none
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduler(String scheduler) {
+        default EtcdStatsEndpointConsumerBuilder scheduler(String scheduler) {
             doSetProperty("scheduler", scheduler);
             return this;
         }
@@ -486,7 +487,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder schedulerProperties(
+        default EtcdStatsEndpointConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -501,7 +502,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder schedulerProperties(
+        default EtcdStatsEndpointConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -514,7 +515,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder startScheduler(
+        default EtcdStatsEndpointConsumerBuilder startScheduler(
                 boolean startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
@@ -527,7 +528,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder startScheduler(String startScheduler) {
+        default EtcdStatsEndpointConsumerBuilder startScheduler(
+                String startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -539,7 +541,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+        default EtcdStatsEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -552,7 +554,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder timeUnit(String timeUnit) {
+        default EtcdStatsEndpointConsumerBuilder timeUnit(String timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -565,7 +567,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder useFixedDelay(boolean useFixedDelay) {
+        default EtcdStatsEndpointConsumerBuilder useFixedDelay(
+                boolean useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -578,7 +581,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder useFixedDelay(String useFixedDelay) {
+        default EtcdStatsEndpointConsumerBuilder useFixedDelay(
+                String useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -589,7 +593,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder password(String password) {
+        default EtcdStatsEndpointConsumerBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -601,7 +605,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder sslContextParameters(
+        default EtcdStatsEndpointConsumerBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -614,7 +618,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder sslContextParameters(
+        default EtcdStatsEndpointConsumerBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -626,20 +630,20 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder userName(String userName) {
+        default EtcdStatsEndpointConsumerBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint consumers for the Etcd component.
+     * Advanced builder for endpoint consumers for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointConsumerBuilder
+    public interface AdvancedEtcdStatsEndpointConsumerBuilder
             extends
                 EndpointConsumerBuilder {
-        default EtcdEndpointConsumerBuilder basic() {
-            return (EtcdEndpointConsumerBuilder) this;
+        default EtcdStatsEndpointConsumerBuilder basic() {
+            return (EtcdStatsEndpointConsumerBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -652,7 +656,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exceptionHandler(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -668,7 +672,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exceptionHandler(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -680,7 +684,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exchangePattern(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -693,7 +697,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exchangePattern(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -701,24 +705,26 @@ public interface EtcdEndpointBuilderFactory {
         /**
          * The index to watch from.
          * 
-         * The option is a: <code>java.lang.Long</code> type.
+         * The option is a: <code>long</code> type.
          * 
          * Default: 0
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder fromIndex(Long fromIndex) {
+        default AdvancedEtcdStatsEndpointConsumerBuilder fromIndex(
+                long fromIndex) {
             doSetProperty("fromIndex", fromIndex);
             return this;
         }
         /**
          * The index to watch from.
          * 
-         * The option will be converted to a <code>java.lang.Long</code> type.
+         * The option will be converted to a <code>long</code> type.
          * 
          * Default: 0
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder fromIndex(String fromIndex) {
+        default AdvancedEtcdStatsEndpointConsumerBuilder fromIndex(
+                String fromIndex) {
             doSetProperty("fromIndex", fromIndex);
             return this;
         }
@@ -733,7 +739,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder pollStrategy(
+        default AdvancedEtcdStatsEndpointConsumerBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -749,7 +755,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder pollStrategy(
+        default AdvancedEtcdStatsEndpointConsumerBuilder pollStrategy(
                 String pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -763,7 +769,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointConsumerBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -777,7 +783,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointConsumerBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -791,7 +797,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointConsumerBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -805,7 +811,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointConsumerBuilder synchronous(
                 String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -813,13 +819,13 @@ public interface EtcdEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint producers for the Etcd component.
+     * Builder for endpoint producers for the Etcd Stats component.
      */
-    public interface EtcdEndpointProducerBuilder
+    public interface EtcdStatsEndpointProducerBuilder
             extends
                 EndpointProducerBuilder {
-        default AdvancedEtcdEndpointProducerBuilder advanced() {
-            return (AdvancedEtcdEndpointProducerBuilder) this;
+        default AdvancedEtcdStatsEndpointProducerBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointProducerBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -829,7 +835,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointProducerBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointProducerBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -841,7 +847,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointProducerBuilder recursive(String recursive) {
+        default EtcdStatsEndpointProducerBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -853,7 +859,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointProducerBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointProducerBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -864,7 +870,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointProducerBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointProducerBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -875,7 +881,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointProducerBuilder timeout(String timeout) {
+        default EtcdStatsEndpointProducerBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -887,7 +893,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointProducerBuilder uris(String uris) {
+        default EtcdStatsEndpointProducerBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -907,7 +913,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder lazyStartProducer(
+        default EtcdStatsEndpointProducerBuilder lazyStartProducer(
                 boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -928,7 +934,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder lazyStartProducer(
+        default EtcdStatsEndpointProducerBuilder lazyStartProducer(
                 String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -940,7 +946,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder timeToLive(Integer timeToLive) {
+        default EtcdStatsEndpointProducerBuilder timeToLive(Integer timeToLive) {
             doSetProperty("timeToLive", timeToLive);
             return this;
         }
@@ -952,7 +958,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder timeToLive(String timeToLive) {
+        default EtcdStatsEndpointProducerBuilder timeToLive(String timeToLive) {
             doSetProperty("timeToLive", timeToLive);
             return this;
         }
@@ -963,7 +969,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder password(String password) {
+        default EtcdStatsEndpointProducerBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -975,7 +981,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder sslContextParameters(
+        default EtcdStatsEndpointProducerBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -988,7 +994,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder sslContextParameters(
+        default EtcdStatsEndpointProducerBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1000,20 +1006,20 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder userName(String userName) {
+        default EtcdStatsEndpointProducerBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint producers for the Etcd component.
+     * Advanced builder for endpoint producers for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointProducerBuilder
+    public interface AdvancedEtcdStatsEndpointProducerBuilder
             extends
                 EndpointProducerBuilder {
-        default EtcdEndpointProducerBuilder basic() {
-            return (EtcdEndpointProducerBuilder) this;
+        default EtcdStatsEndpointProducerBuilder basic() {
+            return (EtcdStatsEndpointProducerBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -1024,7 +1030,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointProducerBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1038,7 +1044,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointProducerBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1052,7 +1058,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointProducerBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -1066,7 +1072,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointProducerBuilder synchronous(
                 String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -1074,14 +1080,14 @@ public interface EtcdEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint for the Etcd component.
+     * Builder for endpoint for the Etcd Stats component.
      */
-    public interface EtcdEndpointBuilder
+    public interface EtcdStatsEndpointBuilder
             extends
-                EtcdEndpointConsumerBuilder,
-                EtcdEndpointProducerBuilder {
-        default AdvancedEtcdEndpointBuilder advanced() {
-            return (AdvancedEtcdEndpointBuilder) this;
+                EtcdStatsEndpointConsumerBuilder,
+                EtcdStatsEndpointProducerBuilder {
+        default AdvancedEtcdStatsEndpointBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -1091,7 +1097,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -1103,7 +1109,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointBuilder recursive(String recursive) {
+        default EtcdStatsEndpointBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -1115,7 +1121,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -1126,7 +1132,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1137,7 +1143,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointBuilder timeout(String timeout) {
+        default EtcdStatsEndpointBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1149,7 +1155,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointBuilder uris(String uris) {
+        default EtcdStatsEndpointBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -1160,7 +1166,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder password(String password) {
+        default EtcdStatsEndpointBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -1172,7 +1178,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder sslContextParameters(
+        default EtcdStatsEndpointBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1185,7 +1191,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder sslContextParameters(
+        default EtcdStatsEndpointBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1197,21 +1203,21 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder userName(String userName) {
+        default EtcdStatsEndpointBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Etcd component.
+     * Advanced builder for endpoint for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointBuilder
+    public interface AdvancedEtcdStatsEndpointBuilder
             extends
-                AdvancedEtcdEndpointConsumerBuilder,
-                AdvancedEtcdEndpointProducerBuilder {
-        default EtcdEndpointBuilder basic() {
-            return (EtcdEndpointBuilder) this;
+                AdvancedEtcdStatsEndpointConsumerBuilder,
+                AdvancedEtcdStatsEndpointProducerBuilder {
+        default EtcdStatsEndpointBuilder basic() {
+            return (EtcdStatsEndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -1222,7 +1228,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1236,7 +1242,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1250,7 +1256,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedEtcdStatsEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -1263,15 +1269,15 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder synchronous(String synchronous) {
+        default AdvancedEtcdStatsEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface EtcdBuilders {
+    public interface EtcdStatsBuilders {
         /**
-         * Etcd (camel-etcd)
+         * Etcd Stats (camel-etcd)
          * The camel etcd component allows you to work with Etcd, a distributed
          * reliable key-value store.
          * 
@@ -1279,21 +1285,17 @@ public interface EtcdEndpointBuilderFactory {
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>etcd:namespace/path</code>
-         * 
-         * Path parameter: namespace (required)
-         * The API namespace to use
-         * The value can be one of: keys, stats, watch
+         * Syntax: <code>etcd-stats:path</code>
          * 
          * Path parameter: path
          * The path the endpoint refers to
          */
-        default EtcdEndpointBuilder etcd(String path) {
-            return EtcdEndpointBuilderFactory.etcd(path);
+        default EtcdStatsEndpointBuilder etcdStats(String path) {
+            return EtcdStatsEndpointBuilderFactory.etcdStats(path);
         }
     }
     /**
-     * Etcd (camel-etcd)
+     * Etcd Stats (camel-etcd)
      * The camel etcd component allows you to work with Etcd, a distributed
      * reliable key-value store.
      * 
@@ -1301,21 +1303,17 @@ public interface EtcdEndpointBuilderFactory {
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>etcd:namespace/path</code>
-     * 
-     * Path parameter: namespace (required)
-     * The API namespace to use
-     * The value can be one of: keys, stats, watch
+     * Syntax: <code>etcd-stats:path</code>
      * 
      * Path parameter: path
      * The path the endpoint refers to
      */
-    static EtcdEndpointBuilder etcd(String path) {
-        class EtcdEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdEndpointBuilder, AdvancedEtcdEndpointBuilder {
-            public EtcdEndpointBuilderImpl(String path) {
-                super("etcd", path);
+    static EtcdStatsEndpointBuilder etcdStats(String path) {
+        class EtcdStatsEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdStatsEndpointBuilder, AdvancedEtcdStatsEndpointBuilder {
+            public EtcdStatsEndpointBuilderImpl(String path) {
+                super("etcd-stats", path);
             }
         }
-        return new EtcdEndpointBuilderImpl(path);
+        return new EtcdStatsEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
similarity index 53%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
index 917c78f..aec1368 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
@@ -24,25 +24,21 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The Ignite Events endpoint is one of camel-ignite endpoints which allows you
- * to receive events from the Ignite cluster by creating a local event listener.
- * This endpoint only supports consumers. The Exchanges created by this consumer
- * put the received Event object into the body of the IN message.
+ * The camel etcd component allows you to work with Etcd, a distributed reliable
+ * key-value store.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface IgniteEventsEndpointBuilderFactory {
+public interface EtcdWatchEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the Ignite Events component.
+     * Builder for endpoint for the Etcd Watch component.
      */
-    public interface IgniteEventsEndpointBuilder
-            extends
-                EndpointConsumerBuilder {
-        default AdvancedIgniteEventsEndpointBuilder advanced() {
-            return (AdvancedIgniteEventsEndpointBuilder) this;
+    public interface EtcdWatchEndpointBuilder extends EndpointConsumerBuilder {
+        default AdvancedEtcdWatchEndpointBuilder advanced() {
+            return (AdvancedEtcdWatchEndpointBuilder) this;
         }
         /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
@@ -58,7 +54,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder bridgeErrorHandler(
+        default EtcdWatchEndpointBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -77,119 +73,165 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder bridgeErrorHandler(
+        default EtcdWatchEndpointBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
-         * The cluster group expression.
+         * To apply an action recursively.
          * 
-         * The option is a:
-         * <code>org.apache.camel.component.ignite.ClusterGroupExpression</code>
-         * type.
+         * The option is a: <code>boolean</code> type.
          * 
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder clusterGroupExpression(
-                Object clusterGroupExpression) {
-            doSetProperty("clusterGroupExpression", clusterGroupExpression);
+        default EtcdWatchEndpointBuilder recursive(boolean recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The cluster group expression.
+         * To apply an action recursively.
          * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.ignite.ClusterGroupExpression</code>
-         * type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder clusterGroupExpression(
-                String clusterGroupExpression) {
-            doSetProperty("clusterGroupExpression", clusterGroupExpression);
+        default EtcdWatchEndpointBuilder recursive(String recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The event types to subscribe to as a comma-separated string of event
-         * constants as defined in EventType . For example:
-         * EVT_CACHE_ENTRY_CREATED,EVT_CACHE_OBJECT_REMOVED,EVT_IGFS_DIR_CREATED.
+         * The path to look for for service discovery.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: EVTS_ALL
+         * Default: /services/
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder events(String events) {
-            doSetProperty("events", events);
+        default EtcdWatchEndpointBuilder servicePath(String servicePath) {
+            doSetProperty("servicePath", servicePath);
+            return this;
+        }
+        /**
+         * To set the URIs the client connects.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: http://localhost:2379,http://localhost:4001
+         * Group: common
+         */
+        default EtcdWatchEndpointBuilder uris(String uris) {
+            doSetProperty("uris", uris);
             return this;
         }
         /**
-         * Sets whether to propagate the incoming body if the return type of the
-         * underlying Ignite operation is void.
+         * To send an empty message in case of timeout watching for a key.
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder propagateIncomingBodyIfNoReturnValue(
-                boolean propagateIncomingBodyIfNoReturnValue) {
-            doSetProperty("propagateIncomingBodyIfNoReturnValue", propagateIncomingBodyIfNoReturnValue);
+        default EtcdWatchEndpointBuilder sendEmptyExchangeOnTimeout(
+                boolean sendEmptyExchangeOnTimeout) {
+            doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
         }
         /**
-         * Sets whether to propagate the incoming body if the return type of the
-         * underlying Ignite operation is void.
+         * To send an empty message in case of timeout watching for a key.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder propagateIncomingBodyIfNoReturnValue(
-                String propagateIncomingBodyIfNoReturnValue) {
-            doSetProperty("propagateIncomingBodyIfNoReturnValue", propagateIncomingBodyIfNoReturnValue);
+        default EtcdWatchEndpointBuilder sendEmptyExchangeOnTimeout(
+                String sendEmptyExchangeOnTimeout) {
+            doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
         }
         /**
-         * Sets whether to treat Collections as cache objects or as Collections
-         * of items to insert/update/compute, etc.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
-         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder treatCollectionsAsCacheObjects(
-                boolean treatCollectionsAsCacheObjects) {
-            doSetProperty("treatCollectionsAsCacheObjects", treatCollectionsAsCacheObjects);
+        default EtcdWatchEndpointBuilder timeout(Long timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * Sets whether to treat Collections as cache objects or as Collections
-         * of items to insert/update/compute, etc.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
-         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder treatCollectionsAsCacheObjects(
-                String treatCollectionsAsCacheObjects) {
-            doSetProperty("treatCollectionsAsCacheObjects", treatCollectionsAsCacheObjects);
+        default EtcdWatchEndpointBuilder timeout(String timeout) {
+            doSetProperty("timeout", timeout);
+            return this;
+        }
+        /**
+         * The password to use for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder password(String password) {
+            doSetProperty("password", password);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * The user name to use for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder userName(String userName) {
+            doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Ignite Events component.
+     * Advanced builder for endpoint for the Etcd Watch component.
      */
-    public interface AdvancedIgniteEventsEndpointBuilder
+    public interface AdvancedEtcdWatchEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default IgniteEventsEndpointBuilder basic() {
-            return (IgniteEventsEndpointBuilder) this;
+        default EtcdWatchEndpointBuilder basic() {
+            return (EtcdWatchEndpointBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -202,7 +244,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exceptionHandler(
+        default AdvancedEtcdWatchEndpointBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -218,7 +260,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exceptionHandler(
+        default AdvancedEtcdWatchEndpointBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -230,7 +272,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exchangePattern(
+        default AdvancedEtcdWatchEndpointBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -243,12 +285,36 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exchangePattern(
+        default AdvancedEtcdWatchEndpointBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
         /**
+         * The index to watch from.
+         * 
+         * The option is a: <code>long</code> type.
+         * 
+         * Default: 0
+         * Group: consumer (advanced)
+         */
+        default AdvancedEtcdWatchEndpointBuilder fromIndex(long fromIndex) {
+            doSetProperty("fromIndex", fromIndex);
+            return this;
+        }
+        /**
+         * The index to watch from.
+         * 
+         * The option will be converted to a <code>long</code> type.
+         * 
+         * Default: 0
+         * Group: consumer (advanced)
+         */
+        default AdvancedEtcdWatchEndpointBuilder fromIndex(String fromIndex) {
+            doSetProperty("fromIndex", fromIndex);
+            return this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -257,7 +323,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdWatchEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -271,7 +337,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdWatchEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -285,8 +351,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder synchronous(
-                boolean synchronous) {
+        default AdvancedEtcdWatchEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -299,58 +364,51 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder synchronous(
-                String synchronous) {
+        default AdvancedEtcdWatchEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface IgniteEventsBuilders {
+    public interface EtcdWatchBuilders {
         /**
-         * Ignite Events (camel-ignite)
-         * The Ignite Events endpoint is one of camel-ignite endpoints which
-         * allows you to receive events from the Ignite cluster by creating a
-         * local event listener. This endpoint only supports consumers. The
-         * Exchanges created by this consumer put the received Event object into
-         * the body of the IN message.
+         * Etcd Watch (camel-etcd)
+         * The camel etcd component allows you to work with Etcd, a distributed
+         * reliable key-value store.
          * 
-         * Category: nosql,cache,compute,messaging,data
-         * Since: 2.17
-         * Maven coordinates: org.apache.camel:camel-ignite
+         * Category: clustering,database
+         * Since: 2.18
+         * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>ignite-events:endpointId</code>
+         * Syntax: <code>etcd-watch:path</code>
          * 
-         * Path parameter: endpointId
-         * The endpoint ID (not used).
+         * Path parameter: path
+         * The path the endpoint refers to
          */
-        default IgniteEventsEndpointBuilder igniteEvents(String path) {
-            return IgniteEventsEndpointBuilderFactory.igniteEvents(path);
+        default EtcdWatchEndpointBuilder etcdWatch(String path) {
+            return EtcdWatchEndpointBuilderFactory.etcdWatch(path);
         }
     }
     /**
-     * Ignite Events (camel-ignite)
-     * The Ignite Events endpoint is one of camel-ignite endpoints which allows
-     * you to receive events from the Ignite cluster by creating a local event
-     * listener. This endpoint only supports consumers. The Exchanges created by
-     * this consumer put the received Event object into the body of the IN
-     * message.
+     * Etcd Watch (camel-etcd)
+     * The camel etcd component allows you to work with Etcd, a distributed
+     * reliable key-value store.
      * 
-     * Category: nosql,cache,compute,messaging,data
-     * Since: 2.17
-     * Maven coordinates: org.apache.camel:camel-ignite
+     * Category: clustering,database
+     * Since: 2.18
+     * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>ignite-events:endpointId</code>
+     * Syntax: <code>etcd-watch:path</code>
      * 
-     * Path parameter: endpointId
-     * The endpoint ID (not used).
+     * Path parameter: path
+     * The path the endpoint refers to
      */
-    static IgniteEventsEndpointBuilder igniteEvents(String path) {
-        class IgniteEventsEndpointBuilderImpl extends AbstractEndpointBuilder implements IgniteEventsEndpointBuilder, AdvancedIgniteEventsEndpointBuilder {
-            public IgniteEventsEndpointBuilderImpl(String path) {
-                super("ignite-events", path);
+    static EtcdWatchEndpointBuilder etcdWatch(String path) {
+        class EtcdWatchEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdWatchEndpointBuilder, AdvancedEtcdWatchEndpointBuilder {
+            public EtcdWatchEndpointBuilderImpl(String path) {
+                super("etcd-watch", path);
             }
         }
-        return new IgniteEventsEndpointBuilderImpl(path);
+        return new EtcdWatchEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
index 9d1d382..e136e29 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
@@ -29,10 +29,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The Facebook component provides access to all of the Facebook APIs accessible
- * using Facebook4J. It allows producing messages to retrieve, add, and delete
- * posts, likes, comments, photos, albums, videos, photos, checkins, locations,
- * links, etc. It also supports APIs that allow polling for posts, users,
- * checkins, groups, locations, etc.
+ * using Facebook4J.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -5409,11 +5406,7 @@ public interface FacebookEndpointBuilderFactory {
         /**
          * Facebook (camel-facebook)
          * The Facebook component provides access to all of the Facebook APIs
-         * accessible using Facebook4J. It allows producing messages to
-         * retrieve, add, and delete posts, likes, comments, photos, albums,
-         * videos, photos, checkins, locations, links, etc. It also supports
-         * APIs that allow polling for posts, users, checkins, groups,
-         * locations, etc.
+         * accessible using Facebook4J.
          * 
          * Category: social
          * Since: 2.14
@@ -5431,10 +5424,7 @@ public interface FacebookEndpointBuilderFactory {
     /**
      * Facebook (camel-facebook)
      * The Facebook component provides access to all of the Facebook APIs
-     * accessible using Facebook4J. It allows producing messages to retrieve,
-     * add, and delete posts, likes, comments, photos, albums, videos, photos,
-     * checkins, locations, links, etc. It also supports APIs that allow polling
-     * for posts, users, checkins, groups, locations, etc.
+     * accessible using Facebook4J.
      * 
      * Category: social
      * Since: 2.14
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index e5565e4..a9f548c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -80,7 +80,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -823,41 +823,41 @@ public interface FileEndpointBuilderFactory {
          * Used by consumer, to only poll the files if it has exclusive
          * read-lock on the file (i.e. the file is not in-progress or being
          * written). Camel will wait until the file lock is granted. This option
-         * provides the build in strategies:\n\n - none - No read lock is in
-         * use\n - markerFile - Camel creates a marker file (fileName.camelLock)
-         * and then holds a lock on it. This option is not available for the FTP
-         * component\n - changed - Changed is using file length/modification
+         * provides the build in strategies: - none - No read lock is in use -
+         * markerFile - Camel creates a marker file (fileName.camelLock) and
+         * then holds a lock on it. This option is not available for the FTP
+         * component - changed - Changed is using file length/modification
          * timestamp to detect whether the file is currently being copied or
          * not. Will at least use 1 sec to determine this, so this option cannot
          * consume files as fast as the others, but can be more reliable as the
          * JDK IO API cannot always determine whether a file is currently being
          * used by another process. The option readLockCheckInterval can be used
-         * to set the check frequency.\n - fileLock - is for using
+         * to set the check frequency. - fileLock - is for using
          * java.nio.channels.FileLock. This option is not avail for Windows OS
          * and the FTP component. This approach should be avoided when accessing
          * a remote file system via a mount/share unless that file system
-         * supports distributed file locks.\n - rename - rename is for using a
-         * try to rename the file as a test if we can get exclusive read-lock.\n
-         * - idempotent - (only for file component) idempotent is for using a
+         * supports distributed file locks. - rename - rename is for using a try
+         * to rename the file as a test if we can get exclusive read-lock. -
+         * idempotent - (only for file component) idempotent is for using a
          * idempotentRepository as the read-lock. This allows to use read locks
          * that supports clustering if the idempotent repository implementation
-         * supports that.\n - idempotent-changed - (only for file component)
+         * supports that. - idempotent-changed - (only for file component)
          * idempotent-changed is for using a idempotentRepository and changed as
          * the combined read-lock. This allows to use read locks that supports
-         * clustering if the idempotent repository implementation supports
-         * that.\n - idempotent-rename - (only for file component)
-         * idempotent-rename is for using a idempotentRepository and rename as
-         * the combined read-lock. This allows to use read locks that supports
-         * clustering if the idempotent repository implementation supports
-         * that.\n \nNotice: The various read locks is not all suited to work in
-         * clustered mode, where concurrent consumers on different nodes is
-         * competing for the same files on a shared file system. The markerFile
-         * using a close to atomic operation to create the empty marker file,
-         * but its not guaranteed to work in a cluster. The fileLock may work
-         * better but then the file system need to support distributed file
-         * locks, and so on. Using the idempotent read lock can support
-         * clustering if the idempotent repository supports clustering, such as
-         * Hazelcast Component or Infinispan.
+         * clustering if the idempotent repository implementation supports that.
+         * - idempotent-rename - (only for file component) idempotent-rename is
+         * for using a idempotentRepository and rename as the combined
+         * read-lock. This allows to use read locks that supports clustering if
+         * the idempotent repository implementation supports that.Notice: The
+         * various read locks is not all suited to work in clustered mode, where
+         * concurrent consumers on different nodes is competing for the same
+         * files on a shared file system. The markerFile using a close to atomic
+         * operation to create the empty marker file, but its not guaranteed to
+         * work in a cluster. The fileLock may work better but then the file
+         * system need to support distributed file locks, and so on. Using the
+         * idempotent read lock can support clustering if the idempotent
+         * repository supports clustering, such as Hazelcast Component or
+         * Infinispan.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -2022,7 +2022,7 @@ public interface FileEndpointBuilderFactory {
          * Whether to enable probing of the content type. If enable then the
          * consumer uses Files#probeContentType(java.nio.file.Path) to determine
          * the content-type of the file, and store that as a header with key
-         * Exchange#FILE_CONTENT_TYPE on the Message .
+         * Exchange#FILE_CONTENT_TYPE on the Message.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2038,7 +2038,7 @@ public interface FileEndpointBuilderFactory {
          * Whether to enable probing of the content type. If enable then the
          * consumer uses Files#probeContentType(java.nio.file.Path) to determine
          * the content-type of the file, and store that as a header with key
-         * Exchange#FILE_CONTENT_TYPE on the Message .
+         * Exchange#FILE_CONTENT_TYPE on the Message.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2371,7 +2371,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -2452,20 +2452,20 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * What to do if a file already exists with the same name. Override,
-         * which is the default, replaces the existing file. \n\n - Append -
-         * adds content to the existing file.\n - Fail - throws a
+         * 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.\n - Ignore - silently ignores the problem and does not
-         * override the existing file, but assumes everything is okay.\n - Move
-         * - option requires to use the moveExisting option to be configured as
+         * 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. The option eagerDeleteTargetFile can be used to control what to
          * do if an moving the file, and there exists already an existing file,
          * otherwise causing the move operation to fail. The Move option will
-         * move any existing files, before writing the target file.\n -
-         * TryRename is only applicable if tempFileName option is in use. This
-         * allows to try renaming the file from the temporary name to the actual
-         * name, without doing any exists check. This check may be faster on
-         * some file systems and especially FTP servers.
+         * move any existing files, before writing the target file. - TryRename
+         * is only applicable if tempFileName option is in use. This allows to
+         * try renaming the file from the temporary name to the actual name,
+         * without doing any exists check. This check may be faster on some file
+         * systems and especially FTP servers.
          * 
          * The option is a:
          * <code>org.apache.camel.component.file.GenericFileExist</code> type.
@@ -2479,20 +2479,20 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * What to do if a file already exists with the same name. Override,
-         * which is the default, replaces the existing file. \n\n - Append -
-         * adds content to the existing file.\n - Fail - throws a
+         * 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.\n - Ignore - silently ignores the problem and does not
-         * override the existing file, but assumes everything is okay.\n - Move
-         * - option requires to use the moveExisting option to be configured as
+         * 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. The option eagerDeleteTargetFile can be used to control what to
          * do if an moving the file, and there exists already an existing file,
          * otherwise causing the move operation to fail. The Move option will
-         * move any existing files, before writing the target file.\n -
-         * TryRename is only applicable if tempFileName option is in use. This
-         * allows to try renaming the file from the temporary name to the actual
-         * name, without doing any exists check. This check may be faster on
-         * some file systems and especially FTP servers.
+         * move any existing files, before writing the target file. - TryRename
+         * is only applicable if tempFileName option is in use. This allows to
+         * try renaming the file from the temporary name to the actual name,
+         * without doing any exists check. This check may be faster on some file
+         * systems and especially FTP servers.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.file.GenericFileExist</code> type.
@@ -3149,7 +3149,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index 72b1c71..e083816 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -614,7 +614,9 @@ public interface FtpEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -629,7 +631,9 @@ public interface FtpEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2684,7 +2688,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2700,7 +2705,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4002,7 +4008,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4018,7 +4025,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4835,7 +4843,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4851,7 +4860,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index ee89f49..b1bbdda 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -615,7 +615,9 @@ public interface FtpsEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -631,7 +633,9 @@ public interface FtpsEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2108,9 +2112,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -2124,9 +2128,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -2879,7 +2883,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2895,7 +2900,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -3729,9 +3735,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -3745,9 +3751,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -4389,7 +4395,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4405,7 +4412,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4986,9 +4994,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -5002,9 +5010,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -5412,7 +5420,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -5428,7 +5437,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index 87e1733..522263b 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -24,21 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The github component is used for integrating Camel with github. The endpoint
- * encapsulates portions of the GitHub API, relying on the
- * org.eclipse.egit.github.core Java SDK. Available endpoint URIs include:
- * CONSUMERS github://pullRequest (new pull requests)
- * github://pullRequestComment (new pull request comments)
- * github://commit/branch (new commits) github://tag (new tags) PRODUCERS
- * github://pullRequestComment (create a new pull request comment; see
- * PullRequestCommentProducer for header requirements) The endpoints will
- * respond with org.eclipse.egit.github.core-provided POJOs (PullRequest,
- * CommitComment, RepositoryTag, RepositoryCommit, etc.) Note: Rather than
- * webhooks, this endpoint relies on simple polling. Reasons include: -
- * concerned about reliability/stability if this somehow relied on an exposed,
- * embedded server (Jetty) - the types of payloads we're polling aren't
- * typically large (plus, paging is available in the API) - need to support apps
- * running somewhere not publicly accessible where a webhook would fail
+ * The github component is used for integrating Camel with github.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -624,22 +610,7 @@ public interface GitHubEndpointBuilderFactory {
     public interface GitHubBuilders {
         /**
          * GitHub (camel-github)
-         * The github component is used for integrating Camel with github. The
-         * endpoint encapsulates portions of the GitHub API, relying on the
-         * org.eclipse.egit.github.core Java SDK. Available endpoint URIs
-         * include: CONSUMERS github://pullRequest (new pull requests)
-         * github://pullRequestComment (new pull request comments)
-         * github://commit/branch (new commits) github://tag (new tags)
-         * PRODUCERS github://pullRequestComment (create a new pull request
-         * comment; see PullRequestCommentProducer for header requirements) The
-         * endpoints will respond with org.eclipse.egit.github.core-provided
-         * POJOs (PullRequest, CommitComment, RepositoryTag, RepositoryCommit,
-         * etc.) Note: Rather than webhooks, this endpoint relies on simple
-         * polling. Reasons include: - concerned about reliability/stability if
-         * this somehow relied on an exposed, embedded server (Jetty) - the
-         * types of payloads we're polling aren't typically large (plus, paging
-         * is available in the API) - need to support apps running somewhere not
-         * publicly accessible where a webhook would fail
+         * The github component is used for integrating Camel with github.
          * 
          * Category: api,file
          * Since: 2.15
@@ -662,22 +633,7 @@ public interface GitHubEndpointBuilderFactory {
     }
     /**
      * GitHub (camel-github)
-     * The github component is used for integrating Camel with github. The
-     * endpoint encapsulates portions of the GitHub API, relying on the
-     * org.eclipse.egit.github.core Java SDK. Available endpoint URIs include:
-     * CONSUMERS github://pullRequest (new pull requests)
-     * github://pullRequestComment (new pull request comments)
-     * github://commit/branch (new commits) github://tag (new tags) PRODUCERS
-     * github://pullRequestComment (create a new pull request comment; see
-     * PullRequestCommentProducer for header requirements) The endpoints will
-     * respond with org.eclipse.egit.github.core-provided POJOs (PullRequest,
-     * CommitComment, RepositoryTag, RepositoryCommit, etc.) Note: Rather than
-     * webhooks, this endpoint relies on simple polling. Reasons include: -
-     * concerned about reliability/stability if this somehow relied on an
-     * exposed, embedded server (Jetty) - the types of payloads we're polling
-     * aren't typically large (plus, paging is available in the API) - need to
-     * support apps running somewhere not publicly accessible where a webhook
-     * would fail
+     * The github component is used for integrating Camel with github.
      * 
      * Category: api,file
      * Since: 2.15
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 507710b..b066273 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -22,16 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition
- * Represents a table within a BigQuery dataset Contains configuration details
- * for a single table and the utility methods (such as check, create) to ease
- * operations URI Parameters: Logger ID - To ensure that logging is unified
- * under Route Logger, the logger ID can be passed on via an endpoint URI
- * parameter Partitioned - to indicate that the table needs to be partitioned -
- * every UTC day to be written into a timestamped separate table side effect:
- * Australian operational day is always split between two UTC days, and,
- * therefore, tables Another consideration is that exceptions are not handled
- * within the class. They are expected to bubble up and be handled by Camel.
+ * Google BigQuery data warehouse for analytics.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -50,7 +41,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option is a:
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -64,7 +55,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -201,18 +192,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
     public interface GoogleBigQueryBuilders {
         /**
          * Google BigQuery (camel-google-bigquery)
-         * Google BigQuery data warehouse for analytics. BigQuery Endpoint
-         * Definition Represents a table within a BigQuery dataset Contains
-         * configuration details for a single table and the utility methods
-         * (such as check, create) to ease operations URI Parameters: Logger ID
-         * - To ensure that logging is unified under Route Logger, the logger ID
-         * can be passed on via an endpoint URI parameter Partitioned - to
-         * indicate that the table needs to be partitioned - every UTC day to be
-         * written into a timestamped separate table side effect: Australian
-         * operational day is always split between two UTC days, and, therefore,
-         * tables Another consideration is that exceptions are not handled
-         * within the class. They are expected to bubble up and be handled by
-         * Camel.
+         * Google BigQuery data warehouse for analytics.
          * 
          * Category: cloud,messaging
          * Since: 2.20
@@ -235,17 +215,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
     }
     /**
      * Google BigQuery (camel-google-bigquery)
-     * Google BigQuery data warehouse for analytics. BigQuery Endpoint
-     * Definition Represents a table within a BigQuery dataset Contains
-     * configuration details for a single table and the utility methods (such as
-     * check, create) to ease operations URI Parameters: Logger ID - To ensure
-     * that logging is unified under Route Logger, the logger ID can be passed
-     * on via an endpoint URI parameter Partitioned - to indicate that the table
-     * needs to be partitioned - every UTC day to be written into a timestamped
-     * separate table side effect: Australian operational day is always split
-     * between two UTC days, and, therefore, tables Another consideration is
-     * that exceptions are not handled within the class. They are expected to
-     * bubble up and be handled by Camel.
+     * Google BigQuery data warehouse for analytics.
      * 
      * Category: cloud,messaging
      * Since: 2.20
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 160c1f8..c48488a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -22,17 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Google BigQuery data warehouse for analytics (using SQL queries). BigQuery
- * Endpoint Definition Represents a table within a BigQuery dataset Contains
- * configuration details for a single table and the utility methods (such as
- * check, create) to ease operations URI Parameters: Logger ID - To ensure that
- * logging is unified under Route Logger, the logger ID can be passed on via an
- * endpoint URI parameter Partitioned - to indicate that the table needs to be
- * partitioned - every UTC day to be written into a timestamped separate table
- * side effect: Australian operational day is always split between two UTC days,
- * and, therefore, tables Another consideration is that exceptions are not
- * handled within the class. They are expected to bubble up and be handled by
- * Camel.
+ * Google BigQuery data warehouse for analytics (using SQL queries).
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -51,7 +41,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option is a:
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -65,7 +55,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -193,17 +183,6 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         /**
          * Google BigQuery Standard SQL (camel-google-bigquery)
          * Google BigQuery data warehouse for analytics (using SQL queries).
-         * BigQuery Endpoint Definition Represents a table within a BigQuery
-         * dataset Contains configuration details for a single table and the
-         * utility methods (such as check, create) to ease operations URI
-         * Parameters: Logger ID - To ensure that logging is unified under Route
-         * Logger, the logger ID can be passed on via an endpoint URI parameter
-         * Partitioned - to indicate that the table needs to be partitioned -
-         * every UTC day to be written into a timestamped separate table side
-         * effect: Australian operational day is always split between two UTC
-         * days, and, therefore, tables Another consideration is that exceptions
-         * are not handled within the class. They are expected to bubble up and
-         * be handled by Camel.
          * 
          * Category: cloud,messaging
          * Since: 2.23
@@ -224,16 +203,6 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
     /**
      * Google BigQuery Standard SQL (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics (using SQL queries).
-     * BigQuery Endpoint Definition Represents a table within a BigQuery dataset
-     * Contains configuration details for a single table and the utility methods
-     * (such as check, create) to ease operations URI Parameters: Logger ID - To
-     * ensure that logging is unified under Route Logger, the logger ID can be
-     * passed on via an endpoint URI parameter Partitioned - to indicate that
-     * the table needs to be partitioned - every UTC day to be written into a
-     * timestamped separate table side effect: Australian operational day is
-     * always split between two UTC days, and, therefore, tables Another
-     * consideration is that exceptions are not handled within the class. They
-     * are expected to bubble up and be handled by Camel.
      * 
      * Category: cloud,messaging
      * Since: 2.23
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
index d3b1a9b..30bccba 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
@@ -47,19 +47,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -84,18 +71,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -132,20 +107,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -618,6 +579,45 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -787,19 +787,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -824,18 +811,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -872,20 +847,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -954,6 +915,45 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -1035,18 +1035,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -1071,17 +1059,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1116,19 +1093,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder refreshToken(String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -1155,6 +1119,42 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("user", user);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder refreshToken(String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
index d30f083..9eb25e9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
@@ -49,19 +49,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -114,18 +101,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -137,20 +112,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -623,6 +584,45 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -791,19 +791,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -856,18 +843,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -879,20 +854,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -962,6 +923,45 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -1042,18 +1042,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -1104,17 +1092,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1126,19 +1103,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder refreshToken(String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -1166,6 +1130,42 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("scopes", scopes);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder refreshToken(String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
index d63b486..5800846 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
@@ -47,18 +47,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -82,18 +70,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the mail application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -105,20 +81,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * 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
@@ -561,6 +523,44 @@ public interface GoogleMailEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the mail application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -729,18 +729,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -764,18 +752,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the mail application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -787,20 +763,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -842,6 +804,44 @@ public interface GoogleMailEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the mail application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -922,59 +922,59 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
+         * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
+        default GoogleMailEndpointBuilder applicationName(String applicationName) {
+            doSetProperty("applicationName", applicationName);
             return this;
         }
         /**
-         * Google mail application name. Example would be camel-google-mail/1.0.
+         * Client ID of the mail application.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder applicationName(String applicationName) {
-            doSetProperty("applicationName", applicationName);
+        default GoogleMailEndpointBuilder clientId(String clientId) {
+            doSetProperty("clientId", clientId);
             return this;
         }
         /**
-         * Client ID of the mail application.
+         * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder clientId(String clientId) {
-            doSetProperty("clientId", clientId);
+        default GoogleMailEndpointBuilder inBody(String inBody) {
+            doSetProperty("inBody", inBody);
             return this;
         }
         /**
-         * Client secret of the mail application.
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleMailEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
+        default GoogleMailEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
             return this;
         }
         /**
-         * Sets the name of a parameter to be passed in the exchange In Body.
+         * Client secret of the mail application.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleMailEndpointBuilder inBody(String inBody) {
-            doSetProperty("inBody", inBody);
+        default GoogleMailEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
             return this;
         }
         /**
@@ -984,7 +984,7 @@ public interface GoogleMailEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
         default GoogleMailEndpointBuilder refreshToken(String refreshToken) {
             doSetProperty("refreshToken", refreshToken);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 2574d8c..966d808 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -24,8 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * Messaging client for Google Cloud Platform PubSub Service Built on top of the
- * Service API libraries (v1).
+ * Messaging client for Google Cloud Platform PubSub Service
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -98,34 +97,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointConsumerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -166,6 +137,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointConsumerBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointConsumerBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
          * 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
@@ -394,34 +391,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointProducerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -462,6 +431,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointProducerBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointProducerBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -638,34 +633,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -705,6 +672,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
             return this;
         }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
     }
 
     /**
@@ -787,8 +780,7 @@ public interface GooglePubsubEndpointBuilderFactory {
     public interface GooglePubsubBuilders {
         /**
          * Google Pubsub (camel-google-pubsub)
-         * Messaging client for Google Cloud Platform PubSub Service Built on
-         * top of the Service API libraries (v1).
+         * Messaging client for Google Cloud Platform PubSub Service
          * 
          * Category: messaging
          * Since: 2.19
@@ -808,8 +800,7 @@ public interface GooglePubsubEndpointBuilderFactory {
     }
     /**
      * Google Pubsub (camel-google-pubsub)
-     * Messaging client for Google Cloud Platform PubSub Service Built on top of
-     * the Service API libraries (v1).
+     * Messaging client for Google Cloud Platform PubSub Service
      * 
      * Category: messaging
      * Since: 2.19
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index 8ba7b1b..c9545b3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -47,19 +47,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -84,18 +71,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -107,20 +82,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Sheets component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * 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
@@ -565,6 +526,45 @@ public interface GoogleSheetsEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -733,19 +733,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -770,18 +757,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -793,20 +768,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Sheets component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -848,6 +809,45 @@ public interface GoogleSheetsEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -928,18 +928,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -964,25 +952,37 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
+         * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleSheetsEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
+        default GoogleSheetsEndpointBuilder inBody(String inBody) {
+            doSetProperty("inBody", inBody);
             return this;
         }
         /**
-         * Sets the name of a parameter to be passed in the exchange In Body.
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleSheetsEndpointBuilder inBody(String inBody) {
-            doSetProperty("inBody", inBody);
+        default GoogleSheetsEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
             return this;
         }
         /**
@@ -992,7 +992,7 @@ public interface GoogleSheetsEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
         default GoogleSheetsEndpointBuilder refreshToken(String refreshToken) {
             doSetProperty("refreshToken", refreshToken);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
index 7b2747e..39627d7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
@@ -71,7 +71,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -88,7 +88,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
@@ -466,7 +466,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -483,7 +483,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
@@ -685,7 +685,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -701,7 +701,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index 0a575c5..61d8ea9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -121,7 +121,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -143,7 +143,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -560,7 +560,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -582,7 +582,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -878,7 +878,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -899,7 +899,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
index cc8cda7..ae306d9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The hazelcast-seda component is used to access Hazelcast BlockingQueue .
+ * The hazelcast-seda component is used to access Hazelcast BlockingQueue.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1093,7 +1093,7 @@ public interface HazelcastSedaEndpointBuilderFactory {
         /**
          * Hazelcast SEDA (camel-hazelcast)
          * The hazelcast-seda component is used to access Hazelcast
-         * BlockingQueue .
+         * BlockingQueue.
          * 
          * Category: cache,datagrid
          * Since: 2.7
@@ -1110,7 +1110,7 @@ public interface HazelcastSedaEndpointBuilderFactory {
     }
     /**
      * Hazelcast SEDA (camel-hazelcast)
-     * The hazelcast-seda component is used to access Hazelcast BlockingQueue .
+     * The hazelcast-seda component is used to access Hazelcast BlockingQueue.
      * 
      * Category: cache,datagrid
      * Since: 2.7
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 98364b1..83f711c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -265,9 +265,8 @@ public interface HttpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Defines a custom host header which will be sent when producing http
-         * request. When not set in query will be ignored. When set will
-         * override host header derived from url. Default: null.
+         * To use custom host header for producer. When not set in query will be
+         * ignored. When set will override host header derived from url.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -728,7 +727,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * To use a custom X509HostnameVerifier such as DefaultHostnameVerifier
-         * or org.apache.http.conn.ssl.NoopHostnameVerifier .
+         * or NoopHostnameVerifier.
          * 
          * The option is a: <code>javax.net.ssl.HostnameVerifier</code> type.
          * 
@@ -741,7 +740,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * To use a custom X509HostnameVerifier such as DefaultHostnameVerifier
-         * or org.apache.http.conn.ssl.NoopHostnameVerifier .
+         * or NoopHostnameVerifier.
          * 
          * The option will be converted to a
          * <code>javax.net.ssl.HostnameVerifier</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
similarity index 69%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
index e3b210d..d28caea 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
@@ -22,54 +22,43 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-iam is used for managing Amazon IAM
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EKS2EndpointBuilderFactory {
+public interface IAM2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 EKS component.
+     * Builder for endpoint for the AWS 2 IAM component.
      */
-    public interface EKS2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEKS2EndpointBuilder advanced() {
-            return (AdvancedEKS2EndpointBuilder) this;
+    public interface IAM2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedIAM2EndpointBuilder advanced() {
+            return (AdvancedIAM2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * To use a existing configured AWS EKS as client.
+         * To use a existing configured AWS IAM as client.
          * 
          * The option is a:
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.iam.IamClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(Object eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default IAM2EndpointBuilder iamClient(Object iamClient) {
+            doSetProperty("iamClient", iamClient);
             return this;
         }
         /**
-         * To use a existing configured AWS EKS as client.
+         * To use a existing configured AWS IAM as client.
          * 
          * The option will be converted to a
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.iam.IamClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(String eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default IAM2EndpointBuilder iamClient(String iamClient) {
+            doSetProperty("iamClient", iamClient);
             return this;
         }
         /**
@@ -88,7 +77,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default IAM2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,7 +97,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default IAM2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -116,12 +105,12 @@ public interface EKS2EndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.iam.IAM2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(EKS2Operations operation) {
+        default IAM2EndpointBuilder operation(IAM2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -129,51 +118,51 @@ public interface EKS2EndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.iam.IAM2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(String operation) {
+        default IAM2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the EKS client.
+         * To define a proxy host when instantiating the IAM client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyHost(String proxyHost) {
+        default IAM2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the IAM client.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(Integer proxyPort) {
+        default IAM2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the IAM client.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(String proxyPort) {
+        default IAM2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the IAM client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -181,12 +170,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default IAM2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the IAM client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -194,12 +183,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default IAM2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * The region in which EKS client needs to work. When using this
+         * 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
... 15528 lines suppressed ...