You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2025/03/17 14:14:55 UTC

(camel) branch main updated: CAMEL-21866: remove etcd3

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 4ccb68b166c CAMEL-21866: remove etcd3
4ccb68b166c is described below

commit 4ccb68b166c0d1210966f17d18b848cdd8b64fed
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Mar 13 11:20:08 2025 +0100

    CAMEL-21866: remove etcd3
---
 bom/camel-bom/pom.xml                              |    5 -
 catalog/camel-allcomponents/pom.xml                |    5 -
 .../org/apache/camel/catalog/beans.properties      |    1 -
 .../catalog/beans/Etcd3AggregationRepository.json  |   16 -
 .../org/apache/camel/catalog/components.properties |    1 -
 .../org/apache/camel/catalog/components/etcd3.json |   88 -
 .../apache/camel/catalog/test-infra/metadata.json  |    9 -
 components/camel-etcd3/pom.xml                     |  121 --
 .../component/etcd3/Etcd3ComponentConfigurer.java  |  191 --
 .../component/etcd3/Etcd3EndpointConfigurer.java   |  187 --
 .../component/etcd3/Etcd3EndpointUriFactory.java   |  101 --
 .../Etcd3ServiceDiscoveryFactoryConfigurer.java    |  157 --
 .../Etcd3AggregationRepositoryConfigurer.java      |   87 -
 .../org/apache/camel/component/etcd3/etcd3.json    |   88 -
 .../services/org/apache/camel/bean.properties      |    7 -
 .../camel/bean/Etcd3AggregationRepository.json     |   16 -
 .../org/apache/camel/cloud/etcd-service-discovery  |    2 -
 .../services/org/apache/camel/component.properties |    7 -
 .../services/org/apache/camel/component/etcd3      |    2 -
 .../org/apache/camel/configurer/etcd3-component    |    2 -
 .../org/apache/camel/configurer/etcd3-endpoint     |    2 -
 ...ponent.etcd3.cloud.Etcd3ServiceDiscoveryFactory |    2 -
 ....processor.aggregate.Etcd3AggregationRepository |    2 -
 .../org/apache/camel/urifactory/etcd3-endpoint     |    2 -
 .../camel-etcd3/src/main/docs/etcd3-component.adoc |  111 --
 .../camel/component/etcd3/Etcd3Component.java      |   61 -
 .../camel/component/etcd3/Etcd3Configuration.java  |  364 ----
 .../camel/component/etcd3/Etcd3Constants.java      |   50 -
 .../camel/component/etcd3/Etcd3Consumer.java       |  150 --
 .../camel/component/etcd3/Etcd3Endpoint.java       |   81 -
 .../apache/camel/component/etcd3/Etcd3Helper.java  |   52 -
 .../camel/component/etcd3/Etcd3Producer.java       |  229 ---
 .../etcd3/cloud/Etcd3GetServicesResponse.java      |   62 -
 .../etcd3/cloud/Etcd3OnDemandServiceDiscovery.java |   37 -
 .../etcd3/cloud/Etcd3ServiceDefinition.java        |   40 -
 .../etcd3/cloud/Etcd3ServiceDiscovery.java         |  160 --
 .../etcd3/cloud/Etcd3ServiceDiscoveryFactory.java  |  286 ---
 .../etcd3/cloud/Etcd3WatchServiceDiscovery.java    |  171 --
 .../component/etcd3/policy/Etcd3RoutePolicy.java   |  466 -----
 .../aggregate/Etcd3AggregationRepository.java      |  595 -------
 .../component/etcd3/AggregateEtcd3ManualTest.java  |   62 -
 .../component/etcd3/MyAggregationStrategy.java     |   61 -
 .../cloud/integration/Etcd3ServiceDiscoveryIT.java |  144 --
 .../etcd3/integration/Etcd3ConsumerIT.java         |  151 --
 .../etcd3/integration/Etcd3ProducerIT.java         |  346 ----
 .../component/etcd3/policy/Etcd3RoutePolicyIT.java |  103 --
 .../etcd3/policy/Etcd3RoutePolicyMain.java         |   49 -
 .../component/etcd3/support/Etcd3TestSupport.java  |   56 -
 .../src/test/resources/log4j2.properties           |   28 -
 components/pom.xml                                 |    1 -
 .../org/apache/camel/main/components.properties    |    1 -
 .../modules/ROOT/examples/json/etcd3.json          |    1 -
 docs/components/modules/ROOT/nav.adoc              |    1 -
 .../modules/ROOT/pages/etcd3-component.adoc        |    1 -
 .../ROOT/pages/camel-4x-upgrade-guide-4_11.adoc    |    3 +
 .../component/ComponentsBuilderFactory.java        |   13 -
 .../dsl/Etcd3ComponentBuilderFactory.java          |  533 ------
 .../builder/endpoint/EndpointBuilderFactory.java   |    1 -
 .../camel/builder/endpoint/EndpointBuilders.java   |    1 -
 .../builder/endpoint/StaticEndpointBuilders.java   |   42 -
 .../endpoint/dsl/Etcd3EndpointBuilderFactory.java  | 1843 --------------------
 .../camel-component-known-dependencies.properties  |    1 -
 parent/pom.xml                                     |    6 -
 test-infra/camel-test-infra-all/pom.xml            |   11 -
 .../src/generated/resources/META-INF/metadata.json |    9 -
 test-infra/camel-test-infra-etcd3/pom.xml          |   58 -
 .../test/infra/etcd3/common/Etcd3Properties.java   |   26 -
 .../infra/etcd3/services/Etcd3InfraService.java    |   27 -
 .../services/Etcd3LocalContainerInfraService.java  |   95 -
 .../etcd3/services/Etcd3RemoteInfraService.java    |   42 -
 .../src/main/resources/META-INF/MANIFEST.MF        |    0
 .../test/infra/etcd3/services/container.properties |   17 -
 .../test/infra/etcd3/services/Etcd3Service.java    |   26 -
 .../infra/etcd3/services/Etcd3ServiceFactory.java  |   43 -
 test-infra/pom.xml                                 |    1 -
 75 files changed, 3 insertions(+), 7816 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3fb91b60b38..cc0b7e2cc22 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -752,11 +752,6 @@
         <artifactId>camel-endpointdsl-support</artifactId>
         <version>4.11.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-etcd3</artifactId>
-        <version>4.11.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-exec</artifactId>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 650ab279f76..b0ca287ef46 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -626,11 +626,6 @@
             <artifactId>camel-elytron</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-etcd3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-exec</artifactId>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties
index 90e65d3af01..cb857b9a427 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties
@@ -10,7 +10,6 @@ DurationRoutePolicyFactory
 EhcacheAggregationRepository
 EhcacheIdempotentRepository
 ElasticsearchBulkRequestAggregationStrategy
-Etcd3AggregationRepository
 FileIdempotentRepository
 GroupedBodyAggregationStrategy
 GroupedExchangeAggregationStrategy
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/Etcd3AggregationRepository.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/Etcd3AggregationRepository.json
deleted file mode 100644
index 0db280366a2..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/Etcd3AggregationRepository.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "bean": {
-    "kind": "bean",
-    "name": "Etcd3AggregationRepository",
-    "javaType": "org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository",
-    "interfaceType": "org.apache.camel.spi.AggregationRepository",
-    "title": "Etcd3 Aggregation Repository",
-    "description": "Aggregation repository that uses Etcd3 to store exchanges.",
-    "deprecated": true,
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-etcd3",
-    "version": "4.11.0-SNAPSHOT",
-    "properties": { "endpoint": { "index": 0, "kind": "property", "displayName": "Endpoint", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "URL to Etcd3 service" }, "prefixName": { "index": 1, "kind": "property", "displayName": "Prefix Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Prefix to us [...]
-  }
-}
-
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 6532b9c0f46..35e55b62419 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -97,7 +97,6 @@ dynamic-router-control
 ehcache
 elasticsearch
 elasticsearch-rest-client
-etcd3
 exec
 fhir
 file
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json
deleted file mode 100644
index 211f3733ba5..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "etcd3",
-    "title": "Etcd v3",
-    "description": "Get, set, delete or watch keys in etcd key-value store.",
-    "deprecated": true,
-    "firstVersion": "3.19.0",
-    "label": "clustering,database",
-    "javaType": "org.apache.camel.component.etcd3.Etcd3Component",
-    "supportLevel": "Preview",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-etcd3",
-    "version": "4.11.0-SNAPSHOT",
-    "scheme": "etcd3",
-    "extendsScheme": "",
-    "syntax": "etcd3:path",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": false,
-    "lenientProperties": false,
-    "browsable": false,
-    "remote": true
-  },
-  "componentProperties": {
-    "configuration": { "index": 0, "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.etcd3.Etcd3Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration." },
-    "endpoints": { "index": 1, "kind": "property", "displayName": "Endpoints", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/localhost:2379", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd server endpoints using the IPNameResolver. Multiple endpoi [...]
-    "keyCharset": { "index": 2, "kind": "property", "displayName": "Key Charset", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the keys." },
-    "namespace": { "index": 3, "kind": "property", "displayName": "Namespace", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the namespace of keys used. \/ will be treated as no namespace." },
-    "prefix": { "index": 4, "kind": "property", "displayName": "Prefix", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "To apply an action on all the key-value pairs whose key that starts with the target path." },
-    "bridgeErrorHandler": { "index": 5, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
-    "fromIndex": { "index": 6, "kind": "property", "displayName": "From Index", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The index to watch from" },
-    "lazyStartProducer": { "index": 7, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "valueCharset": { "index": 8, "kind": "property", "displayName": "Value Charset", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the values." },
-    "authHeaders": { "index": 9, "kind": "property", "displayName": "Auth Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "authHeaders.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be  [...]
-    "authority": { "index": 10, "kind": "property", "displayName": "Authority", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the authority used to authenticate connections to servers." },
-    "autowiredEnabled": { "index": 11, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
-    "connectionTimeout": { "index": 12, "kind": "property", "displayName": "Connection Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the connection timeout." },
-    "headers": { "index": 13, "kind": "property", "displayName": "Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "headers.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be added to htt [...]
-    "keepAliveTime": { "index": 14, "kind": "property", "displayName": "Keep Alive Time", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the interval for gRPC keepalives. The current minimum allow [...]
-    "keepAliveTimeout": { "index": 15, "kind": "property", "displayName": "Keep Alive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the timeout for gRPC keepalives." },
-    "loadBalancerPolicy": { "index": 16, "kind": "property", "displayName": "Load Balancer Policy", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd load balancer policy." },
-    "maxInboundMessageSize": { "index": 17, "kind": "property", "displayName": "Max Inbound Message Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the maximum message size allowed for a single gRPC frame." },
-    "retryDelay": { "index": 18, "kind": "property", "displayName": "Retry Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the delay between retries in milliseconds." },
-    "retryMaxDelay": { "index": 19, "kind": "property", "displayName": "Retry Max Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the max backing off delay between retries in milliseconds." },
-    "retryMaxDuration": { "index": 20, "kind": "property", "displayName": "Retry Max Duration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the retries max duration." },
-    "servicePath": { "index": 21, "kind": "property", "displayName": "Service Path", "group": "cloud", "label": "cloud", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The path to look for service discovery." },
-    "password": { "index": 22, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth password." },
-    "sslContext": { "index": 23, "kind": "property", "displayName": "Ssl Context", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "io.netty.handler.ssl.SslContext", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure SSL\/TLS context to use instead of the system default." },
-    "userName": { "index": 24, "kind": "property", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth user." }
-  },
-  "headers": {
-    "CamelEtcdAction": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The action to perform. Supported values: set get delete", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_ACTION" },
-    "CamelEtcdPath": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The target path", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_PATH" },
-    "CamelEtcdIsPrefix": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "To apply an action on all the key-value pairs whose key that starts with the target path.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_IS_PREFIX" },
-    "CamelEtcdKeyCharset": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The charset to use for the keys.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_KEY_CHARSET" },
-    "CamelEtcdValueCharset": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The charset to use for the values.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_VALUE_CHARSET" }
-  },
-  "properties": {
-    "path": { "index": 0, "kind": "path", "displayName": "Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path the endpoint refers to" },
-    "endpoints": { "index": 1, "kind": "parameter", "displayName": "Endpoints", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/localhost:2379", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd server endpoints using the IPNameResolver. Multiple endpo [...]
-    "keyCharset": { "index": 2, "kind": "parameter", "displayName": "Key Charset", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the keys." },
-    "namespace": { "index": 3, "kind": "parameter", "displayName": "Namespace", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the namespace of keys used. \/ will be treated as no namespace." },
-    "prefix": { "index": 4, "kind": "parameter", "displayName": "Prefix", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "To apply an action on all the key-value pairs whose key that starts with the target path." },
-    "bridgeErrorHandler": { "index": 5, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
-    "exceptionHandler": { "index": 6, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
-    "exchangePattern": { "index": 7, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "fromIndex": { "index": 8, "kind": "parameter", "displayName": "From Index", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The index to watch from" },
-    "valueCharset": { "index": 9, "kind": "parameter", "displayName": "Value Charset", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the values." },
-    "lazyStartProducer": { "index": 10, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
-    "authHeaders": { "index": 11, "kind": "parameter", "displayName": "Auth Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "authHeaders.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to b [...]
-    "authority": { "index": 12, "kind": "parameter", "displayName": "Authority", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the authority used to authenticate connections to servers." },
-    "connectionTimeout": { "index": 13, "kind": "parameter", "displayName": "Connection Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the connection timeout." },
-    "headers": { "index": 14, "kind": "parameter", "displayName": "Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "headers.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be added to ht [...]
-    "keepAliveTime": { "index": 15, "kind": "parameter", "displayName": "Keep Alive Time", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the interval for gRPC keepalives. The current minimum allo [...]
-    "keepAliveTimeout": { "index": 16, "kind": "parameter", "displayName": "Keep Alive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the timeout for gRPC keepalives." },
-    "loadBalancerPolicy": { "index": 17, "kind": "parameter", "displayName": "Load Balancer Policy", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd load balancer policy." },
-    "maxInboundMessageSize": { "index": 18, "kind": "parameter", "displayName": "Max Inbound Message Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the maximum message size allowed for a single gRPC frame." },
-    "retryDelay": { "index": 19, "kind": "parameter", "displayName": "Retry Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the delay between retries in milliseconds." },
-    "retryMaxDelay": { "index": 20, "kind": "parameter", "displayName": "Retry Max Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the max backing off delay between retries in milliseconds." },
-    "retryMaxDuration": { "index": 21, "kind": "parameter", "displayName": "Retry Max Duration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the retries max duration." },
-    "servicePath": { "index": 22, "kind": "parameter", "displayName": "Service Path", "group": "cloud", "label": "cloud", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The path to look for service discovery." },
-    "password": { "index": 23, "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth password." },
-    "sslContext": { "index": 24, "kind": "parameter", "displayName": "Ssl Context", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "io.netty.handler.ssl.SslContext", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure SSL\/TLS context to use instead of the system default." },
-    "userName": { "index": 25, "kind": "parameter", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth user." }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
index 0069c3ee33c..238afd3de87 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
@@ -259,15 +259,6 @@
   "groupId" : "org.apache.camel",
   "artifactId" : "camel-test-infra-azure-storage-queue",
   "version" : "4.11.0-SNAPSHOT"
-}, {
-  "service" : "org.apache.camel.test.infra.etcd3.services.Etcd3InfraService",
-  "description" : "Key Value store etcd3",
-  "implementation" : "org.apache.camel.test.infra.etcd3.services.Etcd3LocalContainerInfraService",
-  "alias" : [ "etcd3" ],
-  "aliasImplementation" : [ ],
-  "groupId" : "org.apache.camel",
-  "artifactId" : "camel-test-infra-etcd3",
-  "version" : "4.11.0-SNAPSHOT"
 }, {
   "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService",
   "description" : "Embedded SFTP Server",
diff --git a/components/camel-etcd3/pom.xml b/components/camel-etcd3/pom.xml
deleted file mode 100644
index 50628cdef92..00000000000
--- a/components/camel-etcd3/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>4.11.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-etcd3</artifactId>
-    <packaging>jar</packaging>
-    <name>Camel :: Etcd3 (deprecated)</name>
-    <description>Camel EtcD v3 component based on jetcd</description>
-
-    <properties>
-        <firstVersion>3.5.0</firstVersion>
-        <label>database</label>
-        <supportLevel>Preview</supportLevel>
-
-        <!-- Etcd3 container is not available or unstable on these platforms -->
-        <skipTests.aarch64>true</skipTests.aarch64>
-        <skipITs.aarch64>true</skipITs.aarch64>
-        <skipTests.s390x>true</skipTests.s390x>
-        <skipITs.s390x>true</skipITs.s390x>
-        <skipTests.ppc64le>true</skipTests.ppc64le>
-        <skipITs.ppc64le>true</skipITs.ppc64le>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloud</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.etcd</groupId>
-            <artifactId>jetcd-core</artifactId>
-            <version>${jetcd-version}</version>
-        </dependency>
-
-        <!-- testing -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-main</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- test infra -->
-       <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-etcd3</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>full</id>
-            <activation>
-                <property>
-                    <name>!quickly</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                               <endpoint>${endpoint}</endpoint>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3ComponentConfigurer.java b/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3ComponentConfigurer.java
deleted file mode 100644
index 01f6cdd8bb6..00000000000
--- a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3ComponentConfigurer.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.etcd3;
-
-import javax.annotation.processing.Generated;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointSchemaGeneratorMojo")
-@SuppressWarnings("unchecked")
-public class Etcd3ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    private org.apache.camel.component.etcd3.Etcd3Configuration getOrCreateConfiguration(Etcd3Component target) {
-        if (target.getConfiguration() == null) {
-            target.setConfiguration(new org.apache.camel.component.etcd3.Etcd3Configuration());
-        }
-        return target.getConfiguration();
-    }
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        Etcd3Component target = (Etcd3Component) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": getOrCreateConfiguration(target).setAuthHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "authority": getOrCreateConfiguration(target).setAuthority(property(camelContext, java.lang.String.class, value)); return true;
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.etcd3.Etcd3Configuration.class, value)); return true;
-        case "connectiontimeout":
-        case "connectionTimeout": getOrCreateConfiguration(target).setConnectionTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "endpoints": getOrCreateConfiguration(target).setEndpoints(property(camelContext, java.lang.String.class, value)); return true;
-        case "fromindex":
-        case "fromIndex": getOrCreateConfiguration(target).setFromIndex(property(camelContext, long.class, value)); return true;
-        case "headers": getOrCreateConfiguration(target).setHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "keepalivetime":
-        case "keepAliveTime": getOrCreateConfiguration(target).setKeepAliveTime(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": getOrCreateConfiguration(target).setKeepAliveTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keycharset":
-        case "keyCharset": getOrCreateConfiguration(target).setKeyCharset(property(camelContext, java.lang.String.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": getOrCreateConfiguration(target).setLoadBalancerPolicy(property(camelContext, java.lang.String.class, value)); return true;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": getOrCreateConfiguration(target).setMaxInboundMessageSize(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "namespace": getOrCreateConfiguration(target).setNamespace(property(camelContext, java.lang.String.class, value)); return true;
-        case "password": getOrCreateConfiguration(target).setPassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "prefix": getOrCreateConfiguration(target).setPrefix(property(camelContext, boolean.class, value)); return true;
-        case "retrydelay":
-        case "retryDelay": getOrCreateConfiguration(target).setRetryDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxdelay":
-        case "retryMaxDelay": getOrCreateConfiguration(target).setRetryMaxDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxduration":
-        case "retryMaxDuration": getOrCreateConfiguration(target).setRetryMaxDuration(property(camelContext, java.time.Duration.class, value)); return true;
-        case "servicepath":
-        case "servicePath": getOrCreateConfiguration(target).setServicePath(property(camelContext, java.lang.String.class, value)); return true;
-        case "sslcontext":
-        case "sslContext": getOrCreateConfiguration(target).setSslContext(property(camelContext, io.netty.handler.ssl.SslContext.class, value)); return true;
-        case "username":
-        case "userName": getOrCreateConfiguration(target).setUserName(property(camelContext, java.lang.String.class, value)); return true;
-        case "valuecharset":
-        case "valueCharset": getOrCreateConfiguration(target).setValueCharset(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.util.Map.class;
-        case "authority": return java.lang.String.class;
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return boolean.class;
-        case "configuration": return org.apache.camel.component.etcd3.Etcd3Configuration.class;
-        case "connectiontimeout":
-        case "connectionTimeout": return java.time.Duration.class;
-        case "endpoints": return java.lang.String.class;
-        case "fromindex":
-        case "fromIndex": return long.class;
-        case "headers": return java.util.Map.class;
-        case "keepalivetime":
-        case "keepAliveTime": return java.time.Duration.class;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return java.time.Duration.class;
-        case "keycharset":
-        case "keyCharset": return java.lang.String.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return java.lang.String.class;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return java.lang.Integer.class;
-        case "namespace": return java.lang.String.class;
-        case "password": return java.lang.String.class;
-        case "prefix": return boolean.class;
-        case "retrydelay":
-        case "retryDelay": return long.class;
-        case "retrymaxdelay":
-        case "retryMaxDelay": return long.class;
-        case "retrymaxduration":
-        case "retryMaxDuration": return java.time.Duration.class;
-        case "servicepath":
-        case "servicePath": return java.lang.String.class;
-        case "sslcontext":
-        case "sslContext": return io.netty.handler.ssl.SslContext.class;
-        case "username":
-        case "userName": return java.lang.String.class;
-        case "valuecharset":
-        case "valueCharset": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        Etcd3Component target = (Etcd3Component) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return getOrCreateConfiguration(target).getAuthHeaders();
-        case "authority": return getOrCreateConfiguration(target).getAuthority();
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "configuration": return target.getConfiguration();
-        case "connectiontimeout":
-        case "connectionTimeout": return getOrCreateConfiguration(target).getConnectionTimeout();
-        case "endpoints": return getOrCreateConfiguration(target).getEndpoints();
-        case "fromindex":
-        case "fromIndex": return getOrCreateConfiguration(target).getFromIndex();
-        case "headers": return getOrCreateConfiguration(target).getHeaders();
-        case "keepalivetime":
-        case "keepAliveTime": return getOrCreateConfiguration(target).getKeepAliveTime();
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return getOrCreateConfiguration(target).getKeepAliveTimeout();
-        case "keycharset":
-        case "keyCharset": return getOrCreateConfiguration(target).getKeyCharset();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return getOrCreateConfiguration(target).getLoadBalancerPolicy();
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return getOrCreateConfiguration(target).getMaxInboundMessageSize();
-        case "namespace": return getOrCreateConfiguration(target).getNamespace();
-        case "password": return getOrCreateConfiguration(target).getPassword();
-        case "prefix": return getOrCreateConfiguration(target).isPrefix();
-        case "retrydelay":
-        case "retryDelay": return getOrCreateConfiguration(target).getRetryDelay();
-        case "retrymaxdelay":
-        case "retryMaxDelay": return getOrCreateConfiguration(target).getRetryMaxDelay();
-        case "retrymaxduration":
-        case "retryMaxDuration": return getOrCreateConfiguration(target).getRetryMaxDuration();
-        case "servicepath":
-        case "servicePath": return getOrCreateConfiguration(target).getServicePath();
-        case "sslcontext":
-        case "sslContext": return getOrCreateConfiguration(target).getSslContext();
-        case "username":
-        case "userName": return getOrCreateConfiguration(target).getUserName();
-        case "valuecharset":
-        case "valueCharset": return getOrCreateConfiguration(target).getValueCharset();
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.lang.String.class;
-        case "headers": return java.lang.String.class;
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointConfigurer.java b/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointConfigurer.java
deleted file mode 100644
index 652aa21dd7f..00000000000
--- a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointConfigurer.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.etcd3;
-
-import javax.annotation.processing.Generated;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointSchemaGeneratorMojo")
-@SuppressWarnings("unchecked")
-public class Etcd3EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        Etcd3Endpoint target = (Etcd3Endpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": target.getConfiguration().setAuthHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "authority": target.getConfiguration().setAuthority(property(camelContext, java.lang.String.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "connectiontimeout":
-        case "connectionTimeout": target.getConfiguration().setConnectionTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "endpoints": target.getConfiguration().setEndpoints(property(camelContext, java.lang.String.class, value)); return true;
-        case "exceptionhandler":
-        case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
-        case "exchangepattern":
-        case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
-        case "fromindex":
-        case "fromIndex": target.getConfiguration().setFromIndex(property(camelContext, long.class, value)); return true;
-        case "headers": target.getConfiguration().setHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "keepalivetime":
-        case "keepAliveTime": target.getConfiguration().setKeepAliveTime(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": target.getConfiguration().setKeepAliveTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keycharset":
-        case "keyCharset": target.getConfiguration().setKeyCharset(property(camelContext, java.lang.String.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": target.getConfiguration().setLoadBalancerPolicy(property(camelContext, java.lang.String.class, value)); return true;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": target.getConfiguration().setMaxInboundMessageSize(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "namespace": target.getConfiguration().setNamespace(property(camelContext, java.lang.String.class, value)); return true;
-        case "password": target.getConfiguration().setPassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "prefix": target.getConfiguration().setPrefix(property(camelContext, boolean.class, value)); return true;
-        case "retrydelay":
-        case "retryDelay": target.getConfiguration().setRetryDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxdelay":
-        case "retryMaxDelay": target.getConfiguration().setRetryMaxDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxduration":
-        case "retryMaxDuration": target.getConfiguration().setRetryMaxDuration(property(camelContext, java.time.Duration.class, value)); return true;
-        case "servicepath":
-        case "servicePath": target.getConfiguration().setServicePath(property(camelContext, java.lang.String.class, value)); return true;
-        case "sslcontext":
-        case "sslContext": target.getConfiguration().setSslContext(property(camelContext, io.netty.handler.ssl.SslContext.class, value)); return true;
-        case "username":
-        case "userName": target.getConfiguration().setUserName(property(camelContext, java.lang.String.class, value)); return true;
-        case "valuecharset":
-        case "valueCharset": target.getConfiguration().setValueCharset(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.util.Map.class;
-        case "authority": return java.lang.String.class;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return boolean.class;
-        case "connectiontimeout":
-        case "connectionTimeout": return java.time.Duration.class;
-        case "endpoints": return java.lang.String.class;
-        case "exceptionhandler":
-        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
-        case "exchangepattern":
-        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
-        case "fromindex":
-        case "fromIndex": return long.class;
-        case "headers": return java.util.Map.class;
-        case "keepalivetime":
-        case "keepAliveTime": return java.time.Duration.class;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return java.time.Duration.class;
-        case "keycharset":
-        case "keyCharset": return java.lang.String.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return java.lang.String.class;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return java.lang.Integer.class;
-        case "namespace": return java.lang.String.class;
-        case "password": return java.lang.String.class;
-        case "prefix": return boolean.class;
-        case "retrydelay":
-        case "retryDelay": return long.class;
-        case "retrymaxdelay":
-        case "retryMaxDelay": return long.class;
-        case "retrymaxduration":
-        case "retryMaxDuration": return java.time.Duration.class;
-        case "servicepath":
-        case "servicePath": return java.lang.String.class;
-        case "sslcontext":
-        case "sslContext": return io.netty.handler.ssl.SslContext.class;
-        case "username":
-        case "userName": return java.lang.String.class;
-        case "valuecharset":
-        case "valueCharset": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        Etcd3Endpoint target = (Etcd3Endpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return target.getConfiguration().getAuthHeaders();
-        case "authority": return target.getConfiguration().getAuthority();
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "connectiontimeout":
-        case "connectionTimeout": return target.getConfiguration().getConnectionTimeout();
-        case "endpoints": return target.getConfiguration().getEndpoints();
-        case "exceptionhandler":
-        case "exceptionHandler": return target.getExceptionHandler();
-        case "exchangepattern":
-        case "exchangePattern": return target.getExchangePattern();
-        case "fromindex":
-        case "fromIndex": return target.getConfiguration().getFromIndex();
-        case "headers": return target.getConfiguration().getHeaders();
-        case "keepalivetime":
-        case "keepAliveTime": return target.getConfiguration().getKeepAliveTime();
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return target.getConfiguration().getKeepAliveTimeout();
-        case "keycharset":
-        case "keyCharset": return target.getConfiguration().getKeyCharset();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return target.getConfiguration().getLoadBalancerPolicy();
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return target.getConfiguration().getMaxInboundMessageSize();
-        case "namespace": return target.getConfiguration().getNamespace();
-        case "password": return target.getConfiguration().getPassword();
-        case "prefix": return target.getConfiguration().isPrefix();
-        case "retrydelay":
-        case "retryDelay": return target.getConfiguration().getRetryDelay();
-        case "retrymaxdelay":
-        case "retryMaxDelay": return target.getConfiguration().getRetryMaxDelay();
-        case "retrymaxduration":
-        case "retryMaxDuration": return target.getConfiguration().getRetryMaxDuration();
-        case "servicepath":
-        case "servicePath": return target.getConfiguration().getServicePath();
-        case "sslcontext":
-        case "sslContext": return target.getConfiguration().getSslContext();
-        case "username":
-        case "userName": return target.getConfiguration().getUserName();
-        case "valuecharset":
-        case "valueCharset": return target.getConfiguration().getValueCharset();
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.lang.String.class;
-        case "headers": return java.lang.String.class;
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointUriFactory.java b/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointUriFactory.java
deleted file mode 100644
index 17c60564816..00000000000
--- a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/Etcd3EndpointUriFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.etcd3;
-
-import javax.annotation.processing.Generated;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.GenerateEndpointUriFactoryMojo")
-public class Etcd3EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":path";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    private static final Set<String> MULTI_VALUE_PREFIXES;
-    static {
-        Set<String> props = new HashSet<>(26);
-        props.add("authHeaders");
-        props.add("authority");
-        props.add("bridgeErrorHandler");
-        props.add("connectionTimeout");
-        props.add("endpoints");
-        props.add("exceptionHandler");
-        props.add("exchangePattern");
-        props.add("fromIndex");
-        props.add("headers");
-        props.add("keepAliveTime");
-        props.add("keepAliveTimeout");
-        props.add("keyCharset");
-        props.add("lazyStartProducer");
-        props.add("loadBalancerPolicy");
-        props.add("maxInboundMessageSize");
-        props.add("namespace");
-        props.add("password");
-        props.add("path");
-        props.add("prefix");
-        props.add("retryDelay");
-        props.add("retryMaxDelay");
-        props.add("retryMaxDuration");
-        props.add("servicePath");
-        props.add("sslContext");
-        props.add("userName");
-        props.add("valueCharset");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        Set<String> secretProps = new HashSet<>(2);
-        secretProps.add("password");
-        secretProps.add("userName");
-        SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps);
-        Set<String> prefixes = new HashSet<>(2);
-        prefixes.add("authHeaders.");
-        prefixes.add("headers.");
-        MULTI_VALUE_PREFIXES = Collections.unmodifiableSet(prefixes);
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "etcd3".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(properties);
-
-        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(uri, copy, encode);
-        return uri;
-    }
-
-    @Override
-    public Set<String> propertyNames() {
-        return PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> secretPropertyNames() {
-        return SECRET_PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> multiValuePrefixes() {
-        return MULTI_VALUE_PREFIXES;
-    }
-
-    @Override
-    public boolean isLenientProperties() {
-        return false;
-    }
-}
-
diff --git a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactoryConfigurer.java b/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactoryConfigurer.java
deleted file mode 100644
index c74f509e7ae..00000000000
--- a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactoryConfigurer.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.etcd3.cloud;
-
-import javax.annotation.processing.Generated;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.GenerateConfigurerMojo")
-@SuppressWarnings("unchecked")
-public class Etcd3ServiceDiscoveryFactoryConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory target = (org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": target.setAuthHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "authority": target.setAuthority(property(camelContext, java.lang.String.class, value)); return true;
-        case "connectiontimeout":
-        case "connectionTimeout": target.setConnectionTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "endpoints": target.setEndpoints(property(camelContext, java.lang.String.class, value)); return true;
-        case "headers": target.setHeaders(property(camelContext, java.util.Map.class, value)); return true;
-        case "keepalivetime":
-        case "keepAliveTime": target.setKeepAliveTime(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": target.setKeepAliveTimeout(property(camelContext, java.time.Duration.class, value)); return true;
-        case "keycharset":
-        case "keyCharset": target.setKeyCharset(property(camelContext, java.lang.String.class, value)); return true;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": target.setLoadBalancerPolicy(property(camelContext, java.lang.String.class, value)); return true;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": target.setMaxInboundMessageSize(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "namespace": target.setNamespace(property(camelContext, java.lang.String.class, value)); return true;
-        case "password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "retrydelay":
-        case "retryDelay": target.setRetryDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxdelay":
-        case "retryMaxDelay": target.setRetryMaxDelay(property(camelContext, long.class, value)); return true;
-        case "retrymaxduration":
-        case "retryMaxDuration": target.setRetryMaxDuration(property(camelContext, java.time.Duration.class, value)); return true;
-        case "servicepath":
-        case "servicePath": target.setServicePath(property(camelContext, java.lang.String.class, value)); return true;
-        case "sslcontext":
-        case "sslContext": target.setSslContext(property(camelContext, io.netty.handler.ssl.SslContext.class, value)); return true;
-        case "type": target.setType(property(camelContext, java.lang.String.class, value)); return true;
-        case "username":
-        case "userName": target.setUserName(property(camelContext, java.lang.String.class, value)); return true;
-        case "valuecharset":
-        case "valueCharset": target.setValueCharset(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.util.Map.class;
-        case "authority": return java.lang.String.class;
-        case "connectiontimeout":
-        case "connectionTimeout": return java.time.Duration.class;
-        case "endpoints": return java.lang.String.class;
-        case "headers": return java.util.Map.class;
-        case "keepalivetime":
-        case "keepAliveTime": return java.time.Duration.class;
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return java.time.Duration.class;
-        case "keycharset":
-        case "keyCharset": return java.lang.String.class;
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return java.lang.String.class;
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return java.lang.Integer.class;
-        case "namespace": return java.lang.String.class;
-        case "password": return java.lang.String.class;
-        case "retrydelay":
-        case "retryDelay": return long.class;
-        case "retrymaxdelay":
-        case "retryMaxDelay": return long.class;
-        case "retrymaxduration":
-        case "retryMaxDuration": return java.time.Duration.class;
-        case "servicepath":
-        case "servicePath": return java.lang.String.class;
-        case "sslcontext":
-        case "sslContext": return io.netty.handler.ssl.SslContext.class;
-        case "type": return java.lang.String.class;
-        case "username":
-        case "userName": return java.lang.String.class;
-        case "valuecharset":
-        case "valueCharset": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory target = (org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return target.getAuthHeaders();
-        case "authority": return target.getAuthority();
-        case "connectiontimeout":
-        case "connectionTimeout": return target.getConnectionTimeout();
-        case "endpoints": return target.getEndpoints();
-        case "headers": return target.getHeaders();
-        case "keepalivetime":
-        case "keepAliveTime": return target.getKeepAliveTime();
-        case "keepalivetimeout":
-        case "keepAliveTimeout": return target.getKeepAliveTimeout();
-        case "keycharset":
-        case "keyCharset": return target.getKeyCharset();
-        case "loadbalancerpolicy":
-        case "loadBalancerPolicy": return target.getLoadBalancerPolicy();
-        case "maxinboundmessagesize":
-        case "maxInboundMessageSize": return target.getMaxInboundMessageSize();
-        case "namespace": return target.getNamespace();
-        case "password": return target.getPassword();
-        case "retrydelay":
-        case "retryDelay": return target.getRetryDelay();
-        case "retrymaxdelay":
-        case "retryMaxDelay": return target.getRetryMaxDelay();
-        case "retrymaxduration":
-        case "retryMaxDuration": return target.getRetryMaxDuration();
-        case "servicepath":
-        case "servicePath": return target.getServicePath();
-        case "sslcontext":
-        case "sslContext": return target.getSslContext();
-        case "type": return target.getType();
-        case "username":
-        case "userName": return target.getUserName();
-        case "valuecharset":
-        case "valueCharset": return target.getValueCharset();
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "authheaders":
-        case "authHeaders": return java.lang.String.class;
-        case "headers": return java.lang.String.class;
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepositoryConfigurer.java b/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepositoryConfigurer.java
deleted file mode 100644
index a8a9ea1f636..00000000000
--- a/components/camel-etcd3/src/generated/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepositoryConfigurer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.etcd3.processor.aggregate;
-
-import javax.annotation.processing.Generated;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.GenerateConfigurerMojo")
-@SuppressWarnings("unchecked")
-public class Etcd3AggregationRepositoryConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository target = (org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "allowserializedheaders":
-        case "allowSerializedHeaders": target.setAllowSerializedHeaders(property(camelContext, boolean.class, value)); return true;
-        case "deadletteruri":
-        case "deadLetterUri": target.setDeadLetterUri(property(camelContext, java.lang.String.class, value)); return true;
-        case "endpoint": target.setEndpoint(property(camelContext, java.lang.String.class, value)); return true;
-        case "maximumredeliveries":
-        case "maximumRedeliveries": target.setMaximumRedeliveries(property(camelContext, int.class, value)); return true;
-        case "optimistic": target.setOptimistic(property(camelContext, boolean.class, value)); return true;
-        case "prefixname":
-        case "prefixName": target.setPrefixName(property(camelContext, java.lang.String.class, value)); return true;
-        case "recoveryinterval":
-        case "recoveryInterval": target.setRecoveryInterval(property(camelContext, long.class, value)); return true;
-        case "userecovery":
-        case "useRecovery": target.setUseRecovery(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "allowserializedheaders":
-        case "allowSerializedHeaders": return boolean.class;
-        case "deadletteruri":
-        case "deadLetterUri": return java.lang.String.class;
-        case "endpoint": return java.lang.String.class;
-        case "maximumredeliveries":
-        case "maximumRedeliveries": return int.class;
-        case "optimistic": return boolean.class;
-        case "prefixname":
-        case "prefixName": return java.lang.String.class;
-        case "recoveryinterval":
-        case "recoveryInterval": return long.class;
-        case "userecovery":
-        case "useRecovery": return boolean.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository target = (org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "allowserializedheaders":
-        case "allowSerializedHeaders": return target.isAllowSerializedHeaders();
-        case "deadletteruri":
-        case "deadLetterUri": return target.getDeadLetterUri();
-        case "endpoint": return target.getEndpoint();
-        case "maximumredeliveries":
-        case "maximumRedeliveries": return target.getMaximumRedeliveries();
-        case "optimistic": return target.isOptimistic();
-        case "prefixname":
-        case "prefixName": return target.getPrefixName();
-        case "recoveryinterval":
-        case "recoveryInterval": return target.getRecoveryInterval();
-        case "userecovery":
-        case "useRecovery": return target.isUseRecovery();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/org/apache/camel/component/etcd3/etcd3.json b/components/camel-etcd3/src/generated/resources/META-INF/org/apache/camel/component/etcd3/etcd3.json
deleted file mode 100644
index 211f3733ba5..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/org/apache/camel/component/etcd3/etcd3.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "etcd3",
-    "title": "Etcd v3",
-    "description": "Get, set, delete or watch keys in etcd key-value store.",
-    "deprecated": true,
-    "firstVersion": "3.19.0",
-    "label": "clustering,database",
-    "javaType": "org.apache.camel.component.etcd3.Etcd3Component",
-    "supportLevel": "Preview",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-etcd3",
-    "version": "4.11.0-SNAPSHOT",
-    "scheme": "etcd3",
-    "extendsScheme": "",
-    "syntax": "etcd3:path",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": false,
-    "lenientProperties": false,
-    "browsable": false,
-    "remote": true
-  },
-  "componentProperties": {
-    "configuration": { "index": 0, "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.etcd3.Etcd3Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration." },
-    "endpoints": { "index": 1, "kind": "property", "displayName": "Endpoints", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/localhost:2379", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd server endpoints using the IPNameResolver. Multiple endpoi [...]
-    "keyCharset": { "index": 2, "kind": "property", "displayName": "Key Charset", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the keys." },
-    "namespace": { "index": 3, "kind": "property", "displayName": "Namespace", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the namespace of keys used. \/ will be treated as no namespace." },
-    "prefix": { "index": 4, "kind": "property", "displayName": "Prefix", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "To apply an action on all the key-value pairs whose key that starts with the target path." },
-    "bridgeErrorHandler": { "index": 5, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
-    "fromIndex": { "index": 6, "kind": "property", "displayName": "From Index", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The index to watch from" },
-    "lazyStartProducer": { "index": 7, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "valueCharset": { "index": 8, "kind": "property", "displayName": "Value Charset", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the values." },
-    "authHeaders": { "index": 9, "kind": "property", "displayName": "Auth Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "authHeaders.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be  [...]
-    "authority": { "index": 10, "kind": "property", "displayName": "Authority", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the authority used to authenticate connections to servers." },
-    "autowiredEnabled": { "index": 11, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
-    "connectionTimeout": { "index": 12, "kind": "property", "displayName": "Connection Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the connection timeout." },
-    "headers": { "index": 13, "kind": "property", "displayName": "Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "headers.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be added to htt [...]
-    "keepAliveTime": { "index": 14, "kind": "property", "displayName": "Keep Alive Time", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the interval for gRPC keepalives. The current minimum allow [...]
-    "keepAliveTimeout": { "index": 15, "kind": "property", "displayName": "Keep Alive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the timeout for gRPC keepalives." },
-    "loadBalancerPolicy": { "index": 16, "kind": "property", "displayName": "Load Balancer Policy", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd load balancer policy." },
-    "maxInboundMessageSize": { "index": 17, "kind": "property", "displayName": "Max Inbound Message Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the maximum message size allowed for a single gRPC frame." },
-    "retryDelay": { "index": 18, "kind": "property", "displayName": "Retry Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the delay between retries in milliseconds." },
-    "retryMaxDelay": { "index": 19, "kind": "property", "displayName": "Retry Max Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the max backing off delay between retries in milliseconds." },
-    "retryMaxDuration": { "index": 20, "kind": "property", "displayName": "Retry Max Duration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the retries max duration." },
-    "servicePath": { "index": 21, "kind": "property", "displayName": "Service Path", "group": "cloud", "label": "cloud", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The path to look for service discovery." },
-    "password": { "index": 22, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth password." },
-    "sslContext": { "index": 23, "kind": "property", "displayName": "Ssl Context", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "io.netty.handler.ssl.SslContext", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure SSL\/TLS context to use instead of the system default." },
-    "userName": { "index": 24, "kind": "property", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth user." }
-  },
-  "headers": {
-    "CamelEtcdAction": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The action to perform. Supported values: set get delete", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_ACTION" },
-    "CamelEtcdPath": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The target path", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_PATH" },
-    "CamelEtcdIsPrefix": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "To apply an action on all the key-value pairs whose key that starts with the target path.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_IS_PREFIX" },
-    "CamelEtcdKeyCharset": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The charset to use for the keys.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_KEY_CHARSET" },
-    "CamelEtcdValueCharset": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The charset to use for the values.", "constantName": "org.apache.camel.component.etcd3.Etcd3Constants#ETCD_VALUE_CHARSET" }
-  },
-  "properties": {
-    "path": { "index": 0, "kind": "path", "displayName": "Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path the endpoint refers to" },
-    "endpoints": { "index": 1, "kind": "parameter", "displayName": "Endpoints", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/localhost:2379", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd server endpoints using the IPNameResolver. Multiple endpo [...]
-    "keyCharset": { "index": 2, "kind": "parameter", "displayName": "Key Charset", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the keys." },
-    "namespace": { "index": 3, "kind": "parameter", "displayName": "Namespace", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the namespace of keys used. \/ will be treated as no namespace." },
-    "prefix": { "index": 4, "kind": "parameter", "displayName": "Prefix", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "To apply an action on all the key-value pairs whose key that starts with the target path." },
-    "bridgeErrorHandler": { "index": 5, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
-    "exceptionHandler": { "index": 6, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
-    "exchangePattern": { "index": 7, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "fromIndex": { "index": 8, "kind": "parameter", "displayName": "From Index", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The index to watch from" },
-    "valueCharset": { "index": 9, "kind": "parameter", "displayName": "Value Charset", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the charset to use for the values." },
-    "lazyStartProducer": { "index": 10, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
-    "authHeaders": { "index": 11, "kind": "parameter", "displayName": "Auth Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "authHeaders.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to b [...]
-    "authority": { "index": 12, "kind": "parameter", "displayName": "Authority", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the authority used to authenticate connections to servers." },
-    "connectionTimeout": { "index": 13, "kind": "parameter", "displayName": "Connection Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the connection timeout." },
-    "headers": { "index": 14, "kind": "parameter", "displayName": "Headers", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "headers.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the headers to be added to ht [...]
-    "keepAliveTime": { "index": 15, "kind": "parameter", "displayName": "Keep Alive Time", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the interval for gRPC keepalives. The current minimum allo [...]
-    "keepAliveTimeout": { "index": 16, "kind": "parameter", "displayName": "Keep Alive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10 seconds", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the timeout for gRPC keepalives." },
-    "loadBalancerPolicy": { "index": 17, "kind": "parameter", "displayName": "Load Balancer Policy", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd load balancer policy." },
-    "maxInboundMessageSize": { "index": 18, "kind": "parameter", "displayName": "Max Inbound Message Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the maximum message size allowed for a single gRPC frame." },
-    "retryDelay": { "index": 19, "kind": "parameter", "displayName": "Retry Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the delay between retries in milliseconds." },
-    "retryMaxDelay": { "index": 20, "kind": "parameter", "displayName": "Retry Max Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2500, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the max backing off delay between retries in milliseconds." },
-    "retryMaxDuration": { "index": 21, "kind": "parameter", "displayName": "Retry Max Duration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure the retries max duration." },
-    "servicePath": { "index": 22, "kind": "parameter", "displayName": "Service Path", "group": "cloud", "label": "cloud", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/", "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "The path to look for service discovery." },
-    "password": { "index": 23, "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth password." },
-    "sslContext": { "index": 24, "kind": "parameter", "displayName": "Ssl Context", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "io.netty.handler.ssl.SslContext", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure SSL\/TLS context to use instead of the system default." },
-    "userName": { "index": 25, "kind": "parameter", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.etcd3.Etcd3Configuration", "configurationField": "configuration", "description": "Configure etcd auth user." }
-  }
-}
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean.properties b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean.properties
deleted file mode 100644
index f34ba093a24..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-bean=Etcd3AggregationRepository
-groupId=org.apache.camel
-artifactId=camel-etcd3
-version=4.11.0-SNAPSHOT
-projectName=Camel :: Etcd3 (deprecated)
-projectDescription=Camel EtcD v3 component based on jetcd
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean/Etcd3AggregationRepository.json b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean/Etcd3AggregationRepository.json
deleted file mode 100644
index 0db280366a2..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/bean/Etcd3AggregationRepository.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "bean": {
-    "kind": "bean",
-    "name": "Etcd3AggregationRepository",
-    "javaType": "org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository",
-    "interfaceType": "org.apache.camel.spi.AggregationRepository",
-    "title": "Etcd3 Aggregation Repository",
-    "description": "Aggregation repository that uses Etcd3 to store exchanges.",
-    "deprecated": true,
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-etcd3",
-    "version": "4.11.0-SNAPSHOT",
-    "properties": { "endpoint": { "index": 0, "kind": "property", "displayName": "Endpoint", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "URL to Etcd3 service" }, "prefixName": { "index": 1, "kind": "property", "displayName": "Prefix Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Prefix to us [...]
-  }
-}
-
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/cloud/etcd-service-discovery b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/cloud/etcd-service-discovery
deleted file mode 100644
index afa38d07cf3..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/cloud/etcd-service-discovery
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index b4280ac6c34..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=etcd3
-groupId=org.apache.camel
-artifactId=camel-etcd3
-version=4.11.0-SNAPSHOT
-projectName=Camel :: Etcd3 (deprecated)
-projectDescription=Camel EtcD v3 component based on jetcd
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component/etcd3 b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component/etcd3
deleted file mode 100644
index f56078fb24a..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/component/etcd3
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.Etcd3Component
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-component b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-component
deleted file mode 100644
index 0a0786bbb50..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.Etcd3ComponentConfigurer
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-endpoint b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-endpoint
deleted file mode 100644
index 6a3fb564b84..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/etcd3-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.Etcd3EndpointConfigurer
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory
deleted file mode 100644
index d92b6551351..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.cloud.Etcd3ServiceDiscoveryFactoryConfigurer
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository
deleted file mode 100644
index e56a8e3dd2b..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepositoryConfigurer
diff --git a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/etcd3-endpoint b/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/etcd3-endpoint
deleted file mode 100644
index 0e8faa50adf..00000000000
--- a/components/camel-etcd3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/etcd3-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.etcd3.Etcd3EndpointUriFactory
diff --git a/components/camel-etcd3/src/main/docs/etcd3-component.adoc b/components/camel-etcd3/src/main/docs/etcd3-component.adoc
deleted file mode 100644
index 0710d94b827..00000000000
--- a/components/camel-etcd3/src/main/docs/etcd3-component.adoc
+++ /dev/null
@@ -1,111 +0,0 @@
-= Etcd v3 Component (deprecated)
-:doctitle: Etcd v3
-:shortname: etcd3
-:artifactid: camel-etcd3
-:description: Get, set, delete or watch keys in etcd key-value store.
-:since: 3.19
-:supportlevel: Preview-deprecated
-:deprecated: *deprecated*
-:tabs-sync-option:
-:component-header: Both producer and consumer are supported
-//Manually maintained attributes
-:camel-spring-boot-name: etcd3
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The Etcd v3 component allows you to work with Etcd, a distributed reliable key-value store.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-etcd3</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-== URI Format
-
-----------------------------
-etcd3:path[?options]
-----------------------------
-
-// component-configure options: START
-
-// component-configure options: END
-
-// component options: START
-include::partial$component-configure-options.adoc[]
-include::partial$component-endpoint-options.adoc[]
-// component options: END
-
-// endpoint options: START
-
-// endpoint options: END
-
-// component headers: START
-include::partial$component-endpoint-headers.adoc[]
-// component headers: END
-
-== Usage
-
-=== Producer Operations (Since 3.20)
-
-Apache Camel supports different etcd operations.
-
-To define the operation, set the exchange header with a key of `CamelEtcdAction`
-and a value set to one of the following:
-
-[width="100%",cols="10%,10%,10%,70%",options="header",]
-|===
-|operation |input message body | output message body |description
-
-|set |*String* value of the key-value pair to put |`PutResponse` result of a put operation| Puts a new key-value pair into etcd where the option `path` or the exchange header `CamelEtcdPath` is the key.
-You can set the key charset by setting the exchange header with
-the key `CamelEtcdKeyCharset`.
-You can set the value charset by setting the exchange header with
-the key `CamelEtcdValueCharset`.
-
-|get |None |`GetResponse` result of the get operation | Retrieve the key-value pair(s) that match with the key corresponding to
-the option `path` or the exchange header `CamelEtcdPath`.
-You can set the key charset by setting the exchange header with
-the key `CamelEtcdKeyCharset`.
-You indicate if the key is a prefix by setting the exchange header with
-the key `CamelEtcdIsPrefix` to `true`.
-
-|delete |None |`DeleteResponse` result of the delete operation |Delete the key-value pair(s) that match with the key corresponding to
-the option `path` or the exchange header `CamelEtcdPath`.
-You can set the key charset by setting the exchange header with
-the key `CamelEtcdKeyCharset`.
-You indicate if the key is a prefix by setting the exchange header with
-the key `CamelEtcdIsPrefix` to `true`.
-
-=== Consumer (Since 3.20)
-
-The consumer of the etcd components allows watching changes on the matching key-value pair(s). One exchange is created per event with the header `CamelEtcdPath` set to the path of the corresponding key-value pair and the body
-of type `WatchEvent`.
-
-You can set the key charset by setting the exchange header with
-the key `CamelEtcdKeyCharset`.
-You indicate if the key is a prefix by setting the exchange header with
-the key `CamelEtcdIsPrefix` to `true`.
-
-By default, the consumer receives only the latest changes, but it is also possible to start watching events from a specific revision by setting the option `fromIndex` to the expected starting index.
-
-=== AggregationRepository
-
-The Etcd v3 component provides an `AggregationStrategy` to use etcd as the backend datastore.
-
-=== RoutePolicy (Since 3.20)
-
-The Etcd v3 component provides a `RoutePolicy` to use etcd as clustered lock.
-
-|===
-
-include::spring-boot:partial$starter.adoc[]
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Component.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Component.java
deleted file mode 100644
index 3925691a7d6..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Component.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
-
-@Component("etcd3")
-public class Etcd3Component extends DefaultComponent {
-
-    @Metadata
-    private Etcd3Configuration configuration = new Etcd3Configuration();
-
-    public Etcd3Configuration getConfiguration() {
-        return configuration;
-    }
-
-    /**
-     * Component configuration.
-     */
-    public void setConfiguration(Etcd3Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        // path must start with leading slash
-        String path = ObjectHelper.isEmpty(remaining) ? "/" : remaining;
-        if (!path.startsWith("/")) {
-            path = String.format("/%s", path);
-        }
-
-        Endpoint endpoint = new Etcd3Endpoint(uri, this, loadConfiguration(), path);
-        setProperties(endpoint, parameters);
-        return endpoint;
-    }
-
-    private Etcd3Configuration loadConfiguration() {
-        return Optional.ofNullable(this.configuration).orElseGet(Etcd3Configuration::new).copy();
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Configuration.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Configuration.java
deleted file mode 100644
index cdf3b36407d..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Configuration.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.ClientBuilder;
-import io.netty.handler.ssl.SslContext;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-
-import static org.apache.camel.component.etcd3.Etcd3Constants.ETCD_DEFAULT_ENDPOINTS;
-
-@UriParams
-public class Etcd3Configuration implements Cloneable {
-
-    @UriParam(label = "common", defaultValue = "http://localhost:2379")
-    private String endpoints = ETCD_DEFAULT_ENDPOINTS;
-    @UriParam(label = "security", secret = true)
-    private String userName;
-    @UriParam(label = "security", secret = true)
-    private String password;
-    @UriParam(label = "advanced,security")
-    private SslContext sslContext;
-    @UriParam(label = "common")
-    private String namespace;
-    @UriParam(label = "advanced")
-    private String loadBalancerPolicy;
-    @UriParam(label = "advanced")
-    private String authority;
-    @UriParam(label = "advanced")
-    private Integer maxInboundMessageSize;
-    @UriParam(label = "advanced", prefix = "headers.", multiValue = true)
-    private Map<String, String> headers = new HashMap<>();
-    @UriParam(label = "advanced", prefix = "authHeaders.", multiValue = true)
-    private Map<String, String> authHeaders = new HashMap<>();
-    @UriParam(label = "advanced", defaultValue = "500")
-    private long retryDelay = 500L;
-    @UriParam(label = "advanced", defaultValue = "2500")
-    private long retryMaxDelay = 2500L;
-    @UriParam(label = "advanced", defaultValue = "30 seconds")
-    private Duration keepAliveTime = Duration.ofSeconds(30L);
-    @UriParam(label = "advanced", defaultValue = "10 seconds")
-    private Duration keepAliveTimeout = Duration.ofSeconds(10L);
-    @UriParam(label = "advanced")
-    private Duration retryMaxDuration;
-    @UriParam(label = "advanced")
-    private Duration connectionTimeout;
-    @UriParam(label = "common", defaultValue = "false")
-    private boolean prefix;
-    @UriParam(label = "consumer,advanced", defaultValue = "0", description = "The index to watch from")
-    private long fromIndex;
-    @UriParam(label = "cloud", defaultValue = "/services/")
-    private String servicePath = "/services/";
-    @UriParam(label = "common", defaultValue = "UTF-8")
-    private String keyCharset = "UTF-8";
-    @UriParam(label = "producer", defaultValue = "UTF-8")
-    private String valueCharset = "UTF-8";
-
-    public String getEndpoints() {
-        return endpoints;
-    }
-
-    String[] getEndpointsAsArray() {
-        return endpoints.split(",");
-    }
-
-    /**
-     * Configure etcd server endpoints using the IPNameResolver. Multiple endpoints can be separated by comma.
-     */
-    public void setEndpoints(String endpoints) {
-        this.endpoints = endpoints;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    /**
-     * Configure etcd auth user.
-     */
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * Configure etcd auth password.
-     */
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Configure the namespace of keys used. "/" will be treated as no namespace.
-     */
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    public SslContext getSslContext() {
-        return sslContext;
-    }
-
-    /**
-     * Configure SSL/TLS context to use instead of the system default.
-     */
-    public void setSslContext(SslContext sslContext) {
-        this.sslContext = sslContext;
-    }
-
-    public String getLoadBalancerPolicy() {
-        return loadBalancerPolicy;
-    }
-
-    /**
-     * Configure etcd load balancer policy.
-     */
-    public void setLoadBalancerPolicy(String loadBalancerPolicy) {
-        this.loadBalancerPolicy = loadBalancerPolicy;
-    }
-
-    public String getAuthority() {
-        return authority;
-    }
-
-    /**
-     * Configure the authority used to authenticate connections to servers.
-     */
-    public void setAuthority(String authority) {
-        this.authority = authority;
-    }
-
-    public Integer getMaxInboundMessageSize() {
-        return maxInboundMessageSize;
-    }
-
-    /**
-     * Configure the maximum message size allowed for a single gRPC frame.
-     */
-    public void setMaxInboundMessageSize(Integer maxInboundMessageSize) {
-        this.maxInboundMessageSize = maxInboundMessageSize;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    /**
-     * Configure the headers to be added to http request headers.
-     */
-    public void setHeaders(Map<String, String> headers) {
-        this.headers = headers;
-    }
-
-    public Map<String, String> getAuthHeaders() {
-        return authHeaders;
-    }
-
-    /**
-     * Configure the headers to be added to auth request headers.
-     */
-    public void setAuthHeaders(Map<String, String> authHeaders) {
-        this.authHeaders = authHeaders;
-    }
-
-    public long getRetryDelay() {
-        return retryDelay;
-    }
-
-    /**
-     * Configure the delay between retries in milliseconds.
-     */
-    public void setRetryDelay(long retryDelay) {
-        this.retryDelay = retryDelay;
-    }
-
-    public long getRetryMaxDelay() {
-        return retryMaxDelay;
-    }
-
-    /**
-     * Configure the max backing off delay between retries in milliseconds.
-     */
-    public void setRetryMaxDelay(long retryMaxDelay) {
-        this.retryMaxDelay = retryMaxDelay;
-    }
-
-    public Duration getKeepAliveTime() {
-        return keepAliveTime;
-    }
-
-    /**
-     * Configure the interval for gRPC keepalives. The current minimum allowed by gRPC is 10 seconds.
-     */
-    public void setKeepAliveTime(Duration keepAliveTime) {
-        this.keepAliveTime = keepAliveTime;
-    }
-
-    public Duration getKeepAliveTimeout() {
-        return keepAliveTimeout;
-    }
-
-    /**
-     * Configure the timeout for gRPC keepalives.
-     */
-    public void setKeepAliveTimeout(Duration keepAliveTimeout) {
-        this.keepAliveTimeout = keepAliveTimeout;
-    }
-
-    public Duration getRetryMaxDuration() {
-        return retryMaxDuration;
-    }
-
-    /**
-     * Configure the retries max duration.
-     */
-    public void setRetryMaxDuration(Duration retryMaxDuration) {
-        this.retryMaxDuration = retryMaxDuration;
-    }
-
-    public Duration getConnectionTimeout() {
-        return connectionTimeout;
-    }
-
-    /**
-     * Configure the connection timeout.
-     */
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.connectionTimeout = connectionTimeout;
-    }
-
-    public boolean isPrefix() {
-        return prefix;
-    }
-
-    /**
-     * To apply an action on all the key-value pairs whose key that starts with the target path.
-     */
-    public void setPrefix(boolean prefix) {
-        this.prefix = prefix;
-    }
-
-    public long getFromIndex() {
-        return fromIndex;
-    }
-
-    /**
-     * The index to watch from.
-     */
-    public void setFromIndex(long fromIndex) {
-        this.fromIndex = fromIndex;
-    }
-
-    public String getServicePath() {
-        return servicePath;
-    }
-
-    /**
-     * The path to look for service discovery.
-     */
-    public void setServicePath(String servicePath) {
-        this.servicePath = servicePath;
-    }
-
-    public String getKeyCharset() {
-        return keyCharset;
-    }
-
-    /**
-     * Configure the charset to use for the keys.
-     */
-    public void setKeyCharset(String keyCharset) {
-        this.keyCharset = keyCharset;
-    }
-
-    public String getValueCharset() {
-        return valueCharset;
-    }
-
-    /**
-     * Configure the charset to use for the values.
-     */
-    public void setValueCharset(String valueCharset) {
-        this.valueCharset = valueCharset;
-    }
-
-    /**
-     * @return a {@link Client} instance configured with all parameters set.
-     */
-    public Client createClient() {
-        final ClientBuilder builder = Client.builder()
-                .endpoints(getEndpointsAsArray())
-                .sslContext(sslContext)
-                .authority(authority)
-                .maxInboundMessageSize(maxInboundMessageSize)
-                .retryDelay(retryDelay)
-                .retryMaxDelay(retryMaxDelay)
-                .retryMaxDuration(retryMaxDuration)
-                .keepaliveTime(keepAliveTime)
-                .keepaliveTimeout(keepAliveTimeout)
-                .connectTimeout(connectionTimeout);
-        if (loadBalancerPolicy != null) {
-            builder.loadBalancerPolicy(loadBalancerPolicy);
-        }
-        if (userName != null) {
-            builder.user(ByteSequence.from(userName.getBytes()));
-        }
-        if (password != null) {
-            builder.password(ByteSequence.from(password.getBytes()));
-        }
-        if (namespace != null) {
-            builder.namespace(ByteSequence.from(namespace.getBytes()));
-        }
-        if (headers != null && !headers.isEmpty()) {
-            for (Map.Entry<String, String> entry : headers.entrySet()) {
-                builder.header(entry.getKey(), entry.getKey());
-            }
-        }
-        if (authHeaders != null && !authHeaders.isEmpty()) {
-            for (Map.Entry<String, String> entry : authHeaders.entrySet()) {
-                builder.authHeader(entry.getKey(), entry.getKey());
-            }
-        }
-        return builder.build();
-    }
-
-    Etcd3Configuration copy() {
-        try {
-            Etcd3Configuration configuration = (Etcd3Configuration) super.clone();
-            configuration.setHeaders(new HashMap<>(headers));
-            configuration.setAuthHeaders(new HashMap<>(authHeaders));
-            return configuration;
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeCamelException(e);
-        }
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Constants.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Constants.java
deleted file mode 100644
index b2f10e9890c..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Constants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import org.apache.camel.spi.Metadata;
-
-public abstract class Etcd3Constants {
-
-    @Metadata(label = "producer", description = "The action to perform.\n" +
-                                                "Supported values:\n" +
-                                                "\n" +
-                                                "* set\n" +
-                                                "* get\n" +
-                                                "* delete\n",
-              javaType = "String")
-    public static final String ETCD_ACTION = "CamelEtcdAction";
-    @Metadata(description = "The target path", javaType = "String")
-    public static final String ETCD_PATH = "CamelEtcdPath";
-    @Metadata(label = "producer",
-              description = "To apply an action on all the key-value pairs whose key that starts with the target path.",
-              javaType = "Boolean")
-    public static final String ETCD_IS_PREFIX = "CamelEtcdIsPrefix";
-    @Metadata(label = "producer", description = "The charset to use for the keys.", javaType = "String")
-    public static final String ETCD_KEY_CHARSET = "CamelEtcdKeyCharset";
-    @Metadata(label = "producer", description = "The charset to use for the values.", javaType = "String")
-    public static final String ETCD_VALUE_CHARSET = "CamelEtcdValueCharset";
-
-    public static final String ETCD_KEYS_ACTION_SET = "set";
-    public static final String ETCD_KEYS_ACTION_DELETE = "delete";
-    public static final String ETCD_KEYS_ACTION_GET = "get";
-
-    public static final String ETCD_DEFAULT_ENDPOINTS = "http://localhost:2379";
-
-    private Etcd3Constants() {
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Consumer.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Consumer.java
deleted file mode 100644
index 246a38df01d..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Consumer.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import java.nio.charset.Charset;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.Watch;
-import io.etcd.jetcd.options.WatchOption;
-import io.etcd.jetcd.watch.WatchEvent;
-import io.etcd.jetcd.watch.WatchResponse;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.StringHelper;
-
-/**
- * A consumer allowing to watch key-value pairs stored into etcd v3.
- */
-class Etcd3Consumer extends DefaultConsumer implements Watch.Listener {
-
-    /**
-     * The configuration of the consumer.
-     */
-    private final Etcd3Configuration configuration;
-    /**
-     * The path of the key-value pair to watch.
-     */
-    private final String path;
-    /**
-     * The client to access to etcd.
-     */
-    private final Client client;
-    /**
-     * The client to watch key-value pairs stored into etcd.
-     */
-    private final Watch watch;
-    /**
-     * The revision from which the changes of the key-value pair are watched.
-     */
-    private final AtomicLong revision;
-    /**
-     * The charset to use for the keys.
-     */
-    private final Charset keyCharset;
-    /**
-     * The current watcher used to watch the changes of the target key-value pair.
-     */
-    private final AtomicReference<Watch.Watcher> watcher = new AtomicReference<>();
-
-    /**
-     * Construct a {@code Etcd3Consumer} with the given parameters.
-     *
-     * @param endpoint      the endpoint corresponding to the consumer.
-     * @param processor     the processor corresponding to the consumer.
-     * @param configuration the configuration of the consumer.
-     * @param path          the path of the key-value pair to watch.
-     */
-    Etcd3Consumer(Etcd3Endpoint endpoint, Processor processor, Etcd3Configuration configuration,
-                  String path) {
-        super(endpoint, processor);
-
-        this.configuration = configuration;
-        this.path = StringHelper.notEmpty(path, "path");
-        this.client = configuration.createClient();
-        this.watch = client.getWatchClient();
-        this.revision = new AtomicLong(configuration.getFromIndex());
-        this.keyCharset = Charset.forName(configuration.getKeyCharset());
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        doWatch();
-        super.doStart();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        try {
-            client.close();
-        } finally {
-            super.doStop();
-        }
-    }
-
-    /**
-     * If allowed, starts to watch the changes on the target key-value pair.
-     */
-    private void doWatch() {
-        if (!isRunAllowed()) {
-            return;
-        }
-        watcher.getAndUpdate(w -> {
-            if (w != null) {
-                w.close();
-            }
-            return watch.watch(
-                    ByteSequence.from(path, keyCharset),
-                    WatchOption.newBuilder().isPrefix(configuration.isPrefix()).withRevision(revision.get()).build(),
-                    this);
-        });
-    }
-
-    @Override
-    public void onNext(WatchResponse response) {
-        for (WatchEvent event : response.getEvents()) {
-            final Exchange exchange = createExchange(false);
-            final KeyValue keyValue = event.getKeyValue();
-            exchange.getIn().setHeader(Etcd3Constants.ETCD_PATH, keyValue.getKey().toString(keyCharset));
-            exchange.getIn().setBody(event);
-            // Watch from the revision + 1 of the node we got for ensuring
-            // no events are missed between watch commands
-            revision.getAndUpdate(r -> Math.max(r, keyValue.getModRevision() + 1));
-            try {
-                getProcessor().process(exchange);
-            } catch (Exception e) {
-                getExceptionHandler().handleException("Error processing exchange", exchange, e);
-            }
-            releaseExchange(exchange, false);
-        }
-    }
-
-    @Override
-    public void onError(Throwable throwable) {
-        handleException("Error processing etcd response", throwable);
-    }
-
-    @Override
-    public void onCompleted() {
-        doWatch();
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Endpoint.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Endpoint.java
deleted file mode 100644
index af2cb2f3bcb..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Endpoint.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import java.util.Map;
-
-import org.apache.camel.Category;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.spi.EndpointServiceLocation;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-import org.apache.camel.support.DefaultEndpoint;
-
-/**
- * Get, set, delete or watch keys in etcd key-value store.
- */
-@UriEndpoint(firstVersion = "3.19.0", scheme = "etcd3", title = "Etcd v3",
-             syntax = "etcd3:path", category = { Category.CLUSTERING, Category.DATABASE },
-             headersClass = Etcd3Constants.class)
-public class Etcd3Endpoint extends DefaultEndpoint implements EndpointServiceLocation {
-
-    @UriPath(label = "common", description = "The path the endpoint refers to")
-    private final String path;
-    @UriParam
-    private final Etcd3Configuration configuration;
-
-    public Etcd3Endpoint(String uri, Etcd3Component component, Etcd3Configuration configuration, String path) {
-        super(uri, component);
-        this.path = path;
-        this.configuration = configuration;
-    }
-
-    @Override
-    public String getServiceUrl() {
-        return configuration.getEndpoints();
-    }
-
-    @Override
-    public String getServiceProtocol() {
-        return "etcd";
-    }
-
-    @Override
-    public Map<String, String> getServiceMetadata() {
-        if (configuration.getUserName() != null) {
-            return Map.of("username", configuration.getUserName());
-        }
-        return null;
-    }
-
-    public Etcd3Configuration getConfiguration() {
-        return configuration;
-    }
-
-    @Override
-    public Producer createProducer() {
-        return new Etcd3Producer(this, configuration, path);
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) {
-        return new Etcd3Consumer(this, processor, configuration, path);
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Helper.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Helper.java
deleted file mode 100644
index 85c8f1747c7..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Helper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * The helper class for the etcd component.
- */
-public final class Etcd3Helper {
-
-    private Etcd3Helper() {
-    }
-
-    /**
-     * @return a specific {@code ObjectMapper} matching with the expectations..
-     */
-    public static ObjectMapper createObjectMapper() {
-        return new ObjectMapper()
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    }
-
-    /**
-     * Converts the given path as path prefix.
-     *
-     * @param  path the path to convert.
-     * @return      the given path if it ends with slash, the given path with an appended slash otherwise.
-     */
-    public static String toPathPrefix(String path) {
-        if (path.endsWith("/")) {
-            return path;
-        }
-        return String.format("%s/", path);
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Producer.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Producer.java
deleted file mode 100644
index 2dcb5e49194..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/Etcd3Producer.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import java.nio.charset.Charset;
-import java.util.concurrent.CompletableFuture;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KV;
-import io.etcd.jetcd.options.DeleteOption;
-import io.etcd.jetcd.options.GetOption;
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Exchange;
-import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.camel.util.StringHelper;
-
-/**
- * A producer allowing to get, delete and update key-value pairs from etcd v3 asynchronous.
- */
-class Etcd3Producer extends DefaultAsyncProducer {
-
-    /**
-     * The configuration of the producer.
-     */
-    private final Etcd3Configuration configuration;
-    /**
-     * The default path against which the action is performed.
-     */
-    private final String path;
-    /**
-     * The client to access to etcd.
-     */
-    private final Client client;
-    /**
-     * The client to access to the key-value pairs stored into etcd.
-     */
-    private final KV kvClient;
-    /**
-     * The default charset to use for the keys.
-     */
-    private final Charset defaultKeyCharset;
-    /**
-     * The default charset to use for the values.
-     */
-    private final Charset defaultValueCharset;
-
-    /**
-     * Construct a {@code Etcd3Producer} with the given parameters.
-     *
-     * @param endpoint      the endpoint corresponding to the producer.
-     * @param configuration the configuration of the producer.
-     * @param path          the default path against which the action is performed.
-     */
-    Etcd3Producer(Etcd3Endpoint endpoint, Etcd3Configuration configuration, String path) {
-        super(endpoint);
-        this.configuration = configuration;
-        this.path = path;
-        this.client = configuration.createClient();
-        this.kvClient = client.getKVClient();
-        this.defaultKeyCharset = Charset.forName(configuration.getKeyCharset());
-        this.defaultValueCharset = Charset.forName(configuration.getValueCharset());
-    }
-
-    @Override
-    public boolean process(Exchange exchange, AsyncCallback callback) {
-        try {
-            String action = exchange.getIn().getHeader(Etcd3Constants.ETCD_ACTION, String.class);
-            String targetPath = exchange.getIn().getHeader(Etcd3Constants.ETCD_PATH, String.class);
-            if (targetPath == null) {
-                targetPath = path;
-            }
-
-            StringHelper.notEmpty(targetPath, Etcd3Constants.ETCD_PATH);
-            StringHelper.notEmpty(action, Etcd3Constants.ETCD_ACTION);
-
-            switch (action) {
-                case Etcd3Constants.ETCD_KEYS_ACTION_SET:
-                    processSetAsync(targetPath, exchange, callback);
-                    break;
-                case Etcd3Constants.ETCD_KEYS_ACTION_GET:
-                    processGetAsync(targetPath, exchange, callback);
-                    break;
-                case Etcd3Constants.ETCD_KEYS_ACTION_DELETE:
-                    processDelAsync(targetPath, exchange, callback);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unknown action " + action);
-            }
-        } catch (Exception e) {
-            exchange.setException(e);
-            callback.done(true);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        try {
-            client.close();
-        } finally {
-            super.doStop();
-        }
-    }
-
-    /**
-     * Add actions to perform once the given future is complete.
-     *
-     * @param future   the future to complete with specific actions.
-     * @param exchange the exchange into which the result of the future (response or exception) is set.
-     * @param callback the callback to call once the future is done.
-     * @param <T>      the result type returned by the future.
-     */
-    private <T> void onComplete(CompletableFuture<T> future, Exchange exchange, AsyncCallback callback) {
-        future.thenAccept(r -> exchange.getIn().setBody(r))
-                .whenComplete(
-                        (r, e) -> {
-                            try {
-                                if (e != null) {
-                                    exchange.setException(new CamelExchangeException(
-                                            "An error occurred while executing the action", exchange, e));
-                                }
-                            } finally {
-                                callback.done(false);
-                            }
-                        });
-    }
-
-    /**
-     * Deletes asynchronously the key-value pair corresponding to the given path.
-     *
-     * @param targetPath the key of the key-value pair to delete.
-     * @param exchange   the exchange into which the result (delete response or exception) is set.
-     * @param callback   the callback to call once the delete operation is done.
-     */
-    private void processDelAsync(String targetPath, Exchange exchange, AsyncCallback callback) {
-        onComplete(
-                kvClient.delete(
-                        ByteSequence.from(targetPath, getKeyCharset(exchange)),
-                        DeleteOption.newBuilder().isPrefix(isPrefix(exchange)).build()),
-                exchange, callback);
-    }
-
-    /**
-     * Gets asynchronously the key-value pair corresponding to the given path.
-     *
-     * @param targetPath the key of the key-value pair to get.
-     * @param exchange   the exchange into which the result (get response or exception) is set.
-     * @param callback   the callback to call once the get operation is done.
-     */
-    private void processGetAsync(String targetPath, Exchange exchange, AsyncCallback callback) {
-        onComplete(
-                kvClient.get(
-                        ByteSequence.from(targetPath, getKeyCharset(exchange)),
-                        GetOption.newBuilder().isPrefix(isPrefix(exchange)).build()),
-                exchange, callback);
-    }
-
-    /**
-     * Puts asynchronously a key-value pair with the given path as key and the message body as value.
-     *
-     * @param targetPath the key of the key-value pair to put.
-     * @param exchange   the exchange from which the message body is extracted and into which the result (put response
-     *                   or exception) is set.
-     * @param callback   the callback to call once the put operation is done.
-     */
-    private void processSetAsync(String targetPath, Exchange exchange, AsyncCallback callback) {
-        onComplete(
-                kvClient.put(
-                        ByteSequence.from(targetPath, getKeyCharset(exchange)),
-                        ByteSequence.from(exchange.getIn().getBody(String.class), getValueCharset(exchange))),
-                exchange, callback);
-    }
-
-    /**
-     * Indicates whether the path given for the operation is a prefix or not.
-     *
-     * @param  exchange the exchange from which the value of the header {@link Etcd3Constants#ETCD_IS_PREFIX} is
-     *                  extracted.
-     * @return          the value of the header {@link Etcd3Constants#ETCD_IS_PREFIX} if it has been set, otherwise the
-     *                  value extracted from the configuration.
-     */
-    private boolean isPrefix(Exchange exchange) {
-        final Boolean isPrefix = exchange.getIn().getHeader(Etcd3Constants.ETCD_IS_PREFIX, Boolean.class);
-        return isPrefix == null ? configuration.isPrefix() : isPrefix;
-    }
-
-    /**
-     * Indicates the charset to use for the keys.
-     *
-     * @param  exchange the exchange from which the value of the header {@link Etcd3Constants#ETCD_KEY_CHARSET} is
-     *                  extracted.
-     * @return          the value of the header {@link Etcd3Constants#ETCD_KEY_CHARSET} if it has been set, otherwise
-     *                  the value extracted from the configuration.
-     */
-    private Charset getKeyCharset(Exchange exchange) {
-        final String charset = exchange.getIn().getHeader(Etcd3Constants.ETCD_KEY_CHARSET, String.class);
-        return charset == null ? defaultKeyCharset : Charset.forName(charset);
-    }
-
-    /**
-     * Indicates the charset to use for the values.
-     *
-     * @param  exchange the exchange from which the value of the header {@link Etcd3Constants#ETCD_VALUE_CHARSET} is
-     *                  extracted.
-     * @return          the value of the header {@link Etcd3Constants#ETCD_VALUE_CHARSET} if it has been set, otherwise
-     *                  the value extracted from the configuration.
-     */
-    private Charset getValueCharset(Exchange exchange) {
-        final String charset = exchange.getIn().getHeader(Etcd3Constants.ETCD_VALUE_CHARSET, String.class);
-        return charset == null ? defaultValueCharset : Charset.forName(charset);
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
deleted file mode 100644
index 949a4ef38bd..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.util.List;
-
-import org.apache.camel.cloud.ServiceDefinition;
-
-/**
- * A plain Java object representing the list of services that could be found at a specific revision.
- */
-@Deprecated
-final class Etcd3GetServicesResponse {
-
-    /**
-     * The revision at which the list of services has been retrieved.
-     */
-    private final long revision;
-    /**
-     * The list of services found.
-     */
-    private final List<ServiceDefinition> services;
-
-    /**
-     * Construct a {@code Etcd3GetServicesResponse} with the given parameters.
-     *
-     * @param revision the revision at which the list of services has been retrieved.
-     * @param services the list of services found.
-     */
-    Etcd3GetServicesResponse(long revision, List<ServiceDefinition> services) {
-        this.revision = revision;
-        this.services = services;
-    }
-
-    /**
-     * @return the revision at which the list of services has been retrieved.
-     */
-    long getRevision() {
-        return revision;
-    }
-
-    /**
-     * @return the list of services found.
-     */
-    List<ServiceDefinition> getServices() {
-        return services;
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
deleted file mode 100644
index dd50bf8879d..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.util.List;
-
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-
-/**
- * An implementation of a {@link Etcd3ServiceDiscovery} that retrieves the service definitions from etcd at each call.
- */
-@Deprecated
-public class Etcd3OnDemandServiceDiscovery extends Etcd3ServiceDiscovery {
-    public Etcd3OnDemandServiceDiscovery(Etcd3Configuration configuration) {
-        super(configuration);
-    }
-
-    @Override
-    public List<ServiceDefinition> getServices(String name) {
-        return findServices(s -> name.equalsIgnoreCase(s.getName())).getServices();
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
deleted file mode 100644
index 775d6ccc7fe..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.util.Comparator;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-
-@Deprecated
-public class Etcd3ServiceDefinition extends DefaultServiceDefinition {
-    public static final Comparator<Etcd3ServiceDefinition> COMPARATOR = Comparator.comparing(Etcd3ServiceDefinition::getHost)
-            .thenComparingInt(Etcd3ServiceDefinition::getPort);
-
-    @JsonCreator
-    public Etcd3ServiceDefinition(
-                                  @JsonProperty("id") final String id,
-                                  @JsonProperty("name") final String name,
-                                  @JsonProperty("address") final String address,
-                                  @JsonProperty("port") final Integer port,
-                                  @JsonProperty("tags") final Map<String, String> tags) {
-        super(id, name, address, port, tags);
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
deleted file mode 100644
index 2eec3020b79..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KV;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.kv.GetResponse;
-import io.etcd.jetcd.options.GetOption;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-import org.apache.camel.component.etcd3.Etcd3Helper;
-import org.apache.camel.impl.cloud.DefaultServiceDiscovery;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.etcd3.Etcd3Helper.toPathPrefix;
-
-/**
- * The root implementation of {@code ServiceDiscovery} fetching the data from etcd.
- */
-@Deprecated
-abstract class Etcd3ServiceDiscovery extends DefaultServiceDiscovery {
-    /**
-     * The logger.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(Etcd3ServiceDiscovery.class);
-    /**
-     * The object mapper used to unmarshall the service definitions.
-     */
-    private static final ObjectMapper MAPPER = Etcd3Helper.createObjectMapper();
-
-    /**
-     * The path prefix of the key-value pairs containing the service definitions.
-     */
-    private final String servicePath;
-    /**
-     * The client to access to etcd.
-     */
-    private final Client client;
-    /**
-     * The client to access to the key-value pairs stored into etcd.
-     */
-    private final KV kvClient;
-    /**
-     * The charset to use for the keys.
-     */
-    private final Charset keyCharset;
-    /**
-     * The charset to use for the keys.
-     */
-    private final Charset valueCharset;
-
-    /**
-     * Construct a {@code Etcd3ServiceDiscovery} with the given configuration.
-     *
-     * @param configuration the configuration used to set up the service discovery.
-     */
-    Etcd3ServiceDiscovery(Etcd3Configuration configuration) {
-        this.servicePath = ObjectHelper.notNull(configuration.getServicePath(), "servicePath");
-        this.client = configuration.createClient();
-        this.kvClient = client.getKVClient();
-        this.keyCharset = Charset.forName(configuration.getKeyCharset());
-        this.valueCharset = Charset.forName(configuration.getValueCharset());
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        try {
-            client.close();
-        } finally {
-            super.doStop();
-        }
-    }
-
-    /**
-     * @return all the service definitions that could be found.
-     */
-    protected Etcd3GetServicesResponse findServices() {
-        return findServices(s -> true);
-    }
-
-    /**
-     * @param  filter the filter to apply.
-     * @return        all the matching service definitions that could be found.
-     */
-    protected Etcd3GetServicesResponse findServices(Predicate<Etcd3ServiceDefinition> filter) {
-        List<ServiceDefinition> servers = Collections.emptyList();
-        long revision = 0;
-
-        if (isRunAllowed()) {
-            try {
-                final GetResponse response = kvClient.get(
-                        ByteSequence.from(toPathPrefix(servicePath), keyCharset),
-                        GetOption.newBuilder().isPrefix(true).build()).get();
-
-                revision = response.getHeader().getRevision();
-                if (response.getCount() > 0) {
-                    servers = response.getKvs().stream()
-                            .map(KeyValue::getValue)
-                            .filter(ObjectHelper::isNotEmpty)
-                            .map(kv -> kv.toString(valueCharset))
-                            .map(this::nodeFromString)
-                            .filter(Objects::nonNull)
-                            .filter(filter)
-                            .sorted(Etcd3ServiceDefinition.COMPARATOR)
-                            .collect(Collectors.toList());
-                }
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RuntimeCamelException(e);
-            } catch (Exception e) {
-                throw new RuntimeCamelException(e);
-            }
-        }
-
-        return new Etcd3GetServicesResponse(revision, servers);
-    }
-
-    /**
-     * Unmarshalls the given value into a service definition.
-     *
-     * @param  value the json payload representing a service definition.
-     * @return       the corresponding service definition if it could be unmarshalled, {@code null} otherwise.
-     */
-    private Etcd3ServiceDefinition nodeFromString(String value) {
-        Etcd3ServiceDefinition server = null;
-        try {
-            server = MAPPER.readValue(value, Etcd3ServiceDefinition.class);
-        } catch (Exception e) {
-            LOGGER.warn("Could not parse the json payload {}", value, e);
-        }
-        return server;
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
deleted file mode 100644
index 2e784424181..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.time.Duration;
-import java.util.Map;
-
-import io.netty.handler.ssl.SslContext;
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.cloud.ServiceDiscoveryFactory;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-import org.apache.camel.spi.Configurer;
-import org.apache.camel.spi.annotations.CloudServiceFactory;
-import org.apache.camel.util.ObjectHelper;
-
-@CloudServiceFactory("etcd-service-discovery")
-@Configurer
-@Deprecated
-public class Etcd3ServiceDiscoveryFactory implements ServiceDiscoveryFactory {
-    /**
-     * The configuration of the factory.
-     */
-    private final Etcd3Configuration configuration;
-    /**
-     * The type of the expected service discovery.
-     */
-    private String type;
-
-    public Etcd3ServiceDiscoveryFactory() {
-        this(new Etcd3Configuration());
-    }
-
-    public Etcd3ServiceDiscoveryFactory(Etcd3Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    // *************************************************************************
-    // Properties
-    // *************************************************************************
-
-    public String getEndpoints() {
-        return configuration.getEndpoints();
-    }
-
-    /**
-     * Configure etcd server endpoints using the IPNameResolver. Multiple endpoints can be separated by comma.
-     */
-    public void setEndpoints(String endpoints) {
-        configuration.setEndpoints(endpoints);
-    }
-
-    public String getUserName() {
-        return configuration.getUserName();
-    }
-
-    /**
-     * Configure etcd auth user.
-     */
-    public void setUserName(String userName) {
-        configuration.setUserName(userName);
-    }
-
-    public String getPassword() {
-        return configuration.getPassword();
-    }
-
-    /**
-     * Configure etcd auth password.
-     */
-    public void setPassword(String password) {
-        configuration.setPassword(password);
-    }
-
-    public String getNamespace() {
-        return configuration.getNamespace();
-    }
-
-    /**
-     * Configure the namespace of keys used. "/" will be treated as no namespace.
-     */
-    public void setNamespace(String namespace) {
-        configuration.setNamespace(namespace);
-    }
-
-    public SslContext getSslContext() {
-        return configuration.getSslContext();
-    }
-
-    /**
-     * Configure SSL/TLS context to use instead of the system default.
-     */
-    public void setSslContext(SslContext sslContext) {
-        configuration.setSslContext(sslContext);
-    }
-
-    public String getLoadBalancerPolicy() {
-        return configuration.getLoadBalancerPolicy();
-    }
-
-    /**
-     * Configure etcd load balancer policy.
-     */
-    public void setLoadBalancerPolicy(String loadBalancerPolicy) {
-        configuration.setLoadBalancerPolicy(loadBalancerPolicy);
-    }
-
-    public String getAuthority() {
-        return configuration.getAuthority();
-    }
-
-    /**
-     * Configure the authority used to authenticate connections to servers.
-     */
-    public void setAuthority(String authority) {
-        configuration.setAuthority(authority);
-    }
-
-    public Integer getMaxInboundMessageSize() {
-        return configuration.getMaxInboundMessageSize();
-    }
-
-    /**
-     * Configure the maximum message size allowed for a single gRPC frame.
-     */
-    public void setMaxInboundMessageSize(Integer maxInboundMessageSize) {
-        configuration.setMaxInboundMessageSize(maxInboundMessageSize);
-    }
-
-    public Map<String, String> getHeaders() {
-        return configuration.getHeaders();
-    }
-
-    /**
-     * Configure the headers to be added to http request headers.
-     */
-    public void setHeaders(Map<String, String> headers) {
-        configuration.setHeaders(headers);
-    }
-
-    public Map<String, String> getAuthHeaders() {
-        return configuration.getAuthHeaders();
-    }
-
-    /**
-     * Configure the headers to be added to auth request headers.
-     */
-    public void setAuthHeaders(Map<String, String> authHeaders) {
-        configuration.setAuthHeaders(authHeaders);
-    }
-
-    public long getRetryDelay() {
-        return configuration.getRetryDelay();
-    }
-
-    /**
-     * Configure the delay between retries in milliseconds.
-     */
-    public void setRetryDelay(long retryDelay) {
-        configuration.setRetryDelay(retryDelay);
-    }
-
-    public long getRetryMaxDelay() {
-        return configuration.getRetryMaxDelay();
-    }
-
-    /**
-     * Configure the max backing off delay between retries in milliseconds.
-     */
-    public void setRetryMaxDelay(long retryMaxDelay) {
-        configuration.setRetryMaxDelay(retryMaxDelay);
-    }
-
-    public Duration getKeepAliveTime() {
-        return configuration.getKeepAliveTime();
-    }
-
-    /**
-     * Configure the interval for gRPC keepalives. The current minimum allowed by gRPC is 10 seconds.
-     */
-    public void setKeepAliveTime(Duration keepAliveTime) {
-        configuration.setKeepAliveTime(keepAliveTime);
-    }
-
-    public Duration getKeepAliveTimeout() {
-        return configuration.getKeepAliveTimeout();
-    }
-
-    /**
-     * Configure the timeout for gRPC keepalives.
-     */
-    public void setKeepAliveTimeout(Duration keepAliveTimeout) {
-        configuration.setKeepAliveTimeout(keepAliveTimeout);
-    }
-
-    public Duration getRetryMaxDuration() {
-        return configuration.getRetryMaxDuration();
-    }
-
-    /**
-     * Configure the retries max duration.
-     */
-    public void setRetryMaxDuration(Duration retryMaxDuration) {
-        this.configuration.setRetryMaxDuration(retryMaxDuration);
-    }
-
-    public Duration getConnectionTimeout() {
-        return configuration.getConnectionTimeout();
-    }
-
-    /**
-     * Configure the connection timeout.
-     */
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.configuration.setConnectionTimeout(connectionTimeout);
-    }
-
-    public String getServicePath() {
-        return configuration.getServicePath();
-    }
-
-    /**
-     * The path to look for service discovery.
-     */
-    public void setServicePath(String servicePath) {
-        configuration.setServicePath(servicePath);
-    }
-
-    public String getKeyCharset() {
-        return configuration.getKeyCharset();
-    }
-
-    /**
-     * Configure the charset to use for the keys.
-     */
-    public void setKeyCharset(String keyCharset) {
-        configuration.setKeyCharset(keyCharset);
-    }
-
-    public String getValueCharset() {
-        return configuration.getValueCharset();
-    }
-
-    /**
-     * Configure the charset to use for the values.
-     */
-    public void setValueCharset(String valueCharset) {
-        configuration.setValueCharset(valueCharset);
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Configure the type of service discovery. Possible values "watch" or any other.
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    // *************************************************************************
-    // Factory
-    // *************************************************************************
-
-    @Override
-    public ServiceDiscovery newInstance(CamelContext camelContext) throws Exception {
-        return ObjectHelper.equal("watch", type, true)
-                ? new Etcd3WatchServiceDiscovery(configuration)
-                : new Etcd3OnDemandServiceDiscovery(configuration);
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
deleted file mode 100644
index 4576ab6afa0..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud;
-
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.Watch;
-import io.etcd.jetcd.options.WatchOption;
-import io.etcd.jetcd.watch.WatchResponse;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.etcd3.Etcd3Helper.toPathPrefix;
-
-/**
- * An implementation of a {@link Etcd3ServiceDiscovery} that retrieves all the service definitions from etcd at first
- * call, then refresh the list when a change has been detected.
- */
-@Deprecated
-public class Etcd3WatchServiceDiscovery extends Etcd3ServiceDiscovery
-        implements Watch.Listener {
-
-    /**
-     * The logger.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(Etcd3WatchServiceDiscovery.class);
-
-    /**
-     * The current list of service definitions found.
-     */
-    private volatile List<ServiceDefinition> allServices;
-    /**
-     * The revision of the last update of the list of service definitions.
-     */
-    private final AtomicLong revision;
-    /**
-     * The path prefix of the key-value pairs containing the service definitions.
-     */
-    private final String servicePath;
-    /**
-     * The client to access to etcd.
-     */
-    private final Client client;
-    /**
-     * The client to watch key-value pairs stored into etcd corresponding to the service definitions.
-     */
-    private final Watch watch;
-    /**
-     * The charset to use for the keys.
-     */
-    private final Charset keyCharset;
-    /**
-     * The current watcher used to watch the changes of the service definitions.
-     */
-    private final AtomicReference<Watch.Watcher> watcher = new AtomicReference<>();
-
-    /**
-     * Construct a {@code Etcd3WatchServiceDiscovery} with the given configuration.
-     *
-     * @param configuration the configuration used to set up the service discovery.
-     */
-    public Etcd3WatchServiceDiscovery(Etcd3Configuration configuration) {
-        super(configuration);
-        this.revision = new AtomicLong();
-        this.servicePath = ObjectHelper.notNull(configuration.getServicePath(), "servicePath");
-        this.client = configuration.createClient();
-        this.watch = client.getWatchClient();
-        this.keyCharset = Charset.forName(configuration.getKeyCharset());
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        try {
-            if (client != null) {
-                client.close();
-            }
-        } finally {
-            super.doStop();
-        }
-    }
-
-    @Override
-    public List<ServiceDefinition> getServices(String name) {
-        List<ServiceDefinition> servers = allServices;
-        if (servers == null) {
-            lock.lock();
-            try {
-                servers = allServices;
-                if (servers == null) {
-                    servers = reloadServices();
-                    doWatch();
-                }
-            } finally {
-                lock.unlock();
-            }
-        }
-
-        return servers.stream()
-                .filter(s -> name.equalsIgnoreCase(s.getName()))
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Gets the list of service definitions from the etcd then update the current list.
-     *
-     * @return list of all service definitions that could be found.
-     */
-    private List<ServiceDefinition> reloadServices() {
-        Etcd3GetServicesResponse response = findServices();
-        revision.getAndUpdate(r -> Math.max(r, response.getRevision() + 1));
-        this.allServices = response.getServices();
-        return response.getServices();
-    }
-
-    /**
-     * If allowed, starts to watch the changes on the service definitions.
-     */
-    private void doWatch() {
-        if (!isRunAllowed()) {
-            return;
-        }
-        watcher.getAndUpdate(w -> {
-            if (w != null) {
-                w.close();
-            }
-            return watch.watch(
-                    ByteSequence.from(toPathPrefix(servicePath), keyCharset),
-                    WatchOption.newBuilder().isPrefix(true).withRevision(revision.get()).build(),
-                    this);
-        });
-    }
-
-    @Override
-    public void onNext(WatchResponse response) {
-        // A change has been received let's reload the list
-        reloadServices();
-    }
-
-    @Override
-    public void onError(Throwable throwable) {
-        LOGGER.debug("Cloud not fetch the index, key={}, cause={}", servicePath, throwable);
-    }
-
-    @Override
-    public void onCompleted() {
-        doWatch();
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicy.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicy.java
deleted file mode 100644
index 708e9c49591..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicy.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.policy;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KV;
-import io.etcd.jetcd.Lease;
-import io.etcd.jetcd.Txn;
-import io.etcd.jetcd.common.exception.ErrorCode;
-import io.etcd.jetcd.common.exception.EtcdException;
-import io.etcd.jetcd.kv.TxnResponse;
-import io.etcd.jetcd.lease.LeaseKeepAliveResponse;
-import io.etcd.jetcd.op.Cmp;
-import io.etcd.jetcd.op.CmpTarget;
-import io.etcd.jetcd.op.Op;
-import io.etcd.jetcd.options.PutOption;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.Route;
-import org.apache.camel.api.management.ManagedAttribute;
-import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-import org.apache.camel.support.RoutePolicySupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.etcd3.Etcd3Constants.ETCD_DEFAULT_ENDPOINTS;
-
-/**
- * An implementation of a route policy based on etcd.
- */
-@ManagedResource(description = "Route policy using Etcd as clustered lock")
-@Deprecated(since = "4.9.0", forRemoval = true)
-public class Etcd3RoutePolicy extends RoutePolicySupport implements CamelContextAware {
-
-    /**
-     * The logger
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(Etcd3RoutePolicy.class);
-    /**
-     * The flag indicating whether the current node is a leader.
-     */
-    private final AtomicBoolean leader = new AtomicBoolean();
-    /**
-     * The routes that have been suspended.
-     */
-    private final Set<Route> suspendedRoutes = new HashSet<>();
-    /**
-     * The time to live in seconds of a key-value pair inserted into etcd. Default value is {@code 60}.
-     */
-    private int ttl = 60;
-    /**
-     * The timeout in seconds of all requests. Default value is {@code 10}.
-     */
-    private int timeout = 10;
-    /**
-     * The route to which the policy is applied.
-     */
-    private volatile Route route;
-    /**
-     * The etcd service name.
-     */
-    private String serviceName;
-    /**
-     * The etcd service path.
-     */
-    private String servicePath;
-    /**
-     * The camel context associated to the policy.
-     */
-    private CamelContext camelContext;
-    /**
-     * The etcd endpoints.
-     */
-    private String[] endpoints;
-    /**
-     * The scheduler used to evaluate regularly the leadership.
-     */
-    private volatile ScheduledExecutorService executorService;
-    /**
-     * The flag indicating whether the consumer should be stopped.
-     */
-    private final AtomicBoolean shouldStopConsumer = new AtomicBoolean(true);
-    /**
-     * The id of the current lease. Only set if the current node is the leader.
-     */
-    private final AtomicLong leaseId = new AtomicLong();
-    /**
-     * The client to access to etcd.
-     */
-    private final AtomicReference<Client> client = new AtomicReference<>();
-    /**
-     * The client to access to the key-value pairs stored into etcd.
-     */
-    private final AtomicReference<KV> kv = new AtomicReference<>();
-    /**
-     * The client to access to the leases stored into etcd.
-     */
-    private final AtomicReference<Lease> lease = new AtomicReference<>();
-    /**
-     * The flag indicating whether the client has been created by the policy or outside the policy.
-     */
-    private final boolean managedClient;
-
-    public Etcd3RoutePolicy() {
-        this(ETCD_DEFAULT_ENDPOINTS);
-    }
-
-    public Etcd3RoutePolicy(Etcd3Configuration configuration) {
-        this(configuration.createClient(), true);
-    }
-
-    public Etcd3RoutePolicy(Client client) {
-        this(client, false);
-    }
-
-    private Etcd3RoutePolicy(Client client, boolean managedClient) {
-        this.client.set(ObjectHelper.notNull(client, "client"));
-        this.managedClient = managedClient;
-    }
-
-    public Etcd3RoutePolicy(String... endpoints) {
-        this.endpoints = endpoints;
-        this.managedClient = true;
-    }
-
-    @Override
-    public void onInit(Route route) {
-        super.onInit(route);
-        this.route = route;
-        if (executorService == null) {
-            executorService = ObjectHelper.notNull(camelContext, "camelContext", this)
-                    .getExecutorServiceManager().newSingleThreadScheduledExecutor(this,
-                            "Etcd3RoutePolicy[" + route.getRouteId() + "]");
-        }
-    }
-
-    @Override
-    public void onStart(Route route) {
-        if (!leader.get() && shouldStopConsumer.get()) {
-            stopConsumer(route);
-        }
-    }
-
-    @Override
-    public void onStop(Route route) {
-        lock.lock();
-        try {
-            suspendedRoutes.remove(route);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void onSuspend(Route route) {
-        lock.lock();
-        try {
-            suspendedRoutes.remove(route);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        Client c = client.get();
-        if (c == null) {
-            c = Client.builder().endpoints(ObjectHelper.notNull(endpoints, "endpoints")).build();
-            this.client.set(c);
-        }
-        lease.set(c.getLeaseClient());
-        kv.set(c.getKVClient());
-        evaluateLeadershipAndSchedule();
-        super.doStart();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (executorService != null) {
-            camelContext.getExecutorServiceManager().shutdownNow(executorService);
-            executorService = null;
-        }
-        try {
-            Client c = client.get();
-            if (managedClient && c != null) {
-                c.close();
-            }
-        } finally {
-            super.doStop();
-        }
-    }
-
-    // *************************************************************************
-    //
-    // *************************************************************************
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    /**
-     * Sets the latest leadership state of the current node and potentially triggers actions if the state has changed.
-     *
-     * @param isLeader {@code true} if the current node is the leader, {@code false} otherwise.
-     */
-    protected void setLeader(boolean isLeader) {
-        if (isLeader) {
-            if (leader.compareAndSet(false, true)) {
-                LOGGER.info("Leadership taken (path={}, name={})", servicePath, serviceName);
-                startAllStoppedConsumers();
-            }
-        } else if (leader.compareAndSet(true, false)) {
-            LOGGER.info("Leadership lost (path={}, name={})", servicePath, serviceName);
-        }
-    }
-
-    /**
-     * Stops the consumer of the given route.
-     *
-     * @param route the route for which the consumer should be stopped.
-     */
-    private void stopConsumer(Route route) {
-        lock.lock();
-        try {
-            if (!suspendedRoutes.contains(route)) {
-                LOGGER.debug("Stopping consumer for {} ({})", route.getId(), route.getConsumer());
-                stopConsumer(route.getConsumer());
-                suspendedRoutes.add(route);
-            }
-        } catch (Exception e) {
-            handleException(e);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    /**
-     * Start all the consumers that have been stopped.
-     */
-    private void startAllStoppedConsumers() {
-        lock.lock();
-        try {
-            for (Route suspendedRoute : suspendedRoutes) {
-                LOGGER.debug("Starting consumer for {} ({})", suspendedRoute.getId(), suspendedRoute.getConsumer());
-                startConsumer(suspendedRoute.getConsumer());
-            }
-
-            suspendedRoutes.clear();
-        } catch (Exception e) {
-            handleException(e);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    // *************************************************************************
-    // Getter/Setters
-    // *************************************************************************
-    public Client getClient() {
-        return client.get();
-    }
-
-    @ManagedAttribute(description = "The route id")
-    public String getRouteId() {
-        if (route != null) {
-            return route.getId();
-        }
-        return null;
-    }
-
-    @ManagedAttribute(description = "The consumer endpoint", mask = true)
-    public String getEndpointUrl() {
-        if (route != null && route.getConsumer() != null && route.getConsumer().getEndpoint() != null) {
-            return route.getConsumer().getEndpoint().toString();
-        }
-        return null;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    @ManagedAttribute(description = "The etcd service name")
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    @ManagedAttribute(description = "The etcd service path")
-    public String getServicePath() {
-        return servicePath;
-    }
-
-    public void setServicePath(String servicePath) {
-        this.servicePath = servicePath;
-    }
-
-    @ManagedAttribute(description = "The time to live (seconds)")
-    public int getTtl() {
-        return ttl;
-    }
-
-    public void setTtl(int ttl) {
-        this.ttl = ttl;
-    }
-
-    @ManagedAttribute(description = "The request timeout (seconds)")
-    public int getTimeout() {
-        return timeout;
-    }
-
-    public void setTimeout(int timeout) {
-        this.timeout = timeout;
-    }
-
-    @ManagedAttribute(description = "Whether to stop consumer when starting up and failed to become master")
-    public boolean isShouldStopConsumer() {
-        return shouldStopConsumer.get();
-    }
-
-    public void setShouldStopConsumer(boolean shouldStopConsumer) {
-        this.shouldStopConsumer.set(shouldStopConsumer);
-    }
-
-    @ManagedAttribute(description = "Is this route the master or a slave")
-    public boolean isLeader() {
-        return leader.get();
-    }
-
-    @ManagedAttribute(description = "Etcd endpoints")
-    public String getEndpoints() {
-        return endpoints == null ? "" : String.join(",", endpoints);
-    }
-
-    public void setEndpoints(String[] endpoints) {
-        this.endpoints = endpoints;
-    }
-
-    public void setEndpoints(String endpoints) {
-        this.endpoints = endpoints.split(",");
-    }
-
-    long getLeaseId() {
-        return leaseId.get();
-    }
-
-    /**
-     * Evaluates the leadership and schedule the next evaluation.
-     */
-    private void evaluateLeadershipAndSchedule() {
-        evaluateLeadership();
-        executorService.schedule(this::evaluateLeadershipAndSchedule, Math.max(2 * ttl / 3, 1), TimeUnit.SECONDS);
-    }
-
-    /**
-     * In case the current node is the leader, it tries to renew the lease if it failed or the current node is a not
-     * leader, it tries to take the leadership.
-     */
-    private void evaluateLeadership() {
-        if (isLeader() && renewLease()) {
-            // The lease could be renewed successfully, so the status of the node did not change
-            return;
-        }
-        setLeader(tryTakeLeadership());
-    }
-
-    /**
-     * Renew the lease using a KeepAlive request to avoid losing the leadership.
-     *
-     * @return {@code true} if the lease could be renewed within the timeout, {@code false} otherwise.
-     */
-    private boolean renewLease() {
-        long id = leaseId.get();
-        if (id == 0) {
-            return false;
-        }
-        try {
-            LeaseKeepAliveResponse keepAliveResponse = lease.get().keepAliveOnce(id).get(timeout, TimeUnit.SECONDS);
-            LOGGER.debug("New TTL of the lease {} is {} seconds", id, keepAliveResponse.getTTL());
-            return true;
-        } catch (ExecutionException e) {
-            boolean notFound = false;
-            if (e.getCause() instanceof EtcdException) {
-                EtcdException ex = (EtcdException) e.getCause();
-                notFound = ex.getErrorCode() == ErrorCode.NOT_FOUND;
-            }
-            if (notFound) {
-                LOGGER.debug("The lease {} doesn't exist anymore", id);
-                leaseId.set(0);
-            } else {
-                LOGGER.debug("Could not renew the lease {}", id, e);
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        } catch (TimeoutException e) {
-            LOGGER.debug("Timeout while trying to renew the lease {}", id);
-        }
-        return false;
-    }
-
-    /**
-     * Grants a new lease and tries to put a key-value pair corresponding to the {@code servicePath} if it is absent.
-     *
-     * @return {@code true} if the put operation is successful indicating that the leadership has been taken,
-     *         {@code false} otherwise.
-     */
-    private boolean tryTakeLeadership() {
-        try {
-            long id = lease.get().grant(ttl, timeout, TimeUnit.SECONDS).get(timeout, TimeUnit.SECONDS).getID();
-            Txn transaction = kv.get().txn();
-            ByteSequence key = ByteSequence.from(servicePath.getBytes());
-            // Put if absent
-            TxnResponse response = transaction.If(new Cmp(key, Cmp.Op.EQUAL, CmpTarget.version(0)))
-                    .Then(Op.put(key, ByteSequence.from(serviceName.getBytes()),
-                            PutOption.newBuilder().withLeaseId(id).build()))
-                    .commit()
-                    .get(timeout, TimeUnit.SECONDS);
-
-            boolean succeeded = response.isSucceeded();
-            if (succeeded) {
-                leaseId.set(id);
-            } else {
-                lease.get().revoke(id);
-            }
-            return succeeded;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            LOGGER.debug("Could not try to take the leadership", e);
-        } catch (TimeoutException e) {
-            LOGGER.debug("Timeout while trying to take the leadership");
-        }
-        return false;
-    }
-}
diff --git a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepository.java b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepository.java
deleted file mode 100644
index e7c0fa39200..00000000000
--- a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/processor/aggregate/Etcd3AggregationRepository.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.processor.aggregate;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KV;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.Txn;
-import io.etcd.jetcd.kv.DeleteResponse;
-import io.etcd.jetcd.kv.GetResponse;
-import io.etcd.jetcd.kv.PutResponse;
-import io.etcd.jetcd.op.Cmp;
-import io.etcd.jetcd.op.CmpTarget;
-import io.etcd.jetcd.op.Op;
-import io.etcd.jetcd.options.DeleteOption;
-import io.etcd.jetcd.options.GetOption;
-import io.etcd.jetcd.options.PutOption;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Configurer;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.OptimisticLockingAggregationRepository;
-import org.apache.camel.spi.RecoverableAggregationRepository;
-import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.support.DefaultExchangeHolder;
-import org.apache.camel.support.service.ServiceSupport;
-import org.apache.camel.util.StringHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Metadata(label = "bean",
-          description = "Aggregation repository that uses Etcd3 to store exchanges.",
-          annotations = { "interfaceName=org.apache.camel.spi.AggregationRepository" })
-@Configurer(metadataOnly = true)
-@Deprecated(since = "4.9.0", forRemoval = true)
-public class Etcd3AggregationRepository extends ServiceSupport
-        implements RecoverableAggregationRepository, OptimisticLockingAggregationRepository {
-    private static final Logger LOG = LoggerFactory.getLogger(Etcd3AggregationRepository.class);
-    private static final String COMPLETED_SUFFIX = "-completed";
-
-    @Metadata(description = "URL to Etcd3 service", required = true)
-    private String endpoint;
-    private Client client;
-    private boolean shutdownClient;
-    private KV kvClient;
-    @Metadata(description = "Prefix to use as primary key", required = true)
-    private String prefixName;
-    @Metadata(label = "advanced", description = "Prefix to use as primary key for completed exchanges")
-    private String persistencePrefixName;
-    @Metadata(description = "Whether or not to use optimistic locking")
-    private boolean optimistic;
-    @Metadata(description = "Whether or not recovery is enabled", defaultValue = "true")
-    private boolean useRecovery = true;
-    @Metadata(description = "Sets the interval between recovery scans", defaultValue = "5000")
-    private long recoveryInterval = 5000;
-    @Metadata(description = "Sets an optional dead letter channel which exhausted recovered Exchange should be send to.")
-    private String deadLetterUri;
-    @Metadata(description = "Sets an optional limit of the number of redelivery attempt of recovered Exchange should be attempted, before its exhausted."
-                            + " When this limit is hit, then the Exchange is moved to the dead letter channel.",
-              defaultValue = "3")
-    private int maximumRedeliveries = 3;
-    @Metadata(label = "advanced",
-              description = "Whether headers on the Exchange that are Java objects and Serializable should be included and saved to the repository")
-    private boolean allowSerializedHeaders;
-
-    public Etcd3AggregationRepository() {
-    }
-
-    public Etcd3AggregationRepository(final String prefixName, final String endpoint) {
-        this.prefixName = prefixName;
-        this.persistencePrefixName = String.format("%s%s", prefixName, COMPLETED_SUFFIX);
-        this.optimistic = false;
-        this.endpoint = endpoint;
-    }
-
-    public Etcd3AggregationRepository(final String prefixName, final String persistencePrefixName,
-                                      final String endpoint) {
-        this.prefixName = prefixName;
-        this.persistencePrefixName = persistencePrefixName;
-        this.optimistic = false;
-        this.endpoint = endpoint;
-    }
-
-    public Etcd3AggregationRepository(final String prefixName, final String endpoint, boolean optimistic) {
-        this(prefixName, endpoint);
-        this.optimistic = optimistic;
-    }
-
-    public Etcd3AggregationRepository(final String repositoryName, final String persistentRepositoryName,
-                                      final String endpoint, boolean optimistic) {
-        this(repositoryName, persistentRepositoryName, endpoint);
-        this.optimistic = optimistic;
-    }
-
-    @Override
-    public Exchange add(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange)
-            throws OptimisticLockingException {
-        if (!optimistic) {
-            throw new UnsupportedOperationException();
-        }
-        LOG.trace("Adding an Exchange with ID {} for key {} in an optimistic manner.", newExchange.getExchangeId(),
-                key);
-        try {
-            if (oldExchange == null) {
-                DefaultExchangeHolder holder = DefaultExchangeHolder.marshal(newExchange, true, allowSerializedHeaders);
-                CompletableFuture<GetResponse> completableGetResponse = kvClient
-                        .get(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                GetResponse getResponse = completableGetResponse.get();
-                List<KeyValue> keyValues = getResponse.getKvs();
-                if (keyValues.isEmpty()) {
-                    CompletableFuture<PutResponse> completablePutResponse = kvClient.put(
-                            ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()),
-                            convertToEtcd3Format(holder));
-                    completablePutResponse.get();
-                } else {
-                    DefaultExchangeHolder misbehaviorHolder
-                            = (DefaultExchangeHolder) convertFromEtcd3Format(keyValues.get(0).getValue());
-                    Exchange misbehaviorEx = unmarshallExchange(camelContext, misbehaviorHolder);
-                    LOG.warn(
-                            "Optimistic locking failed for exchange with key {}: kvClient.get returned Exchange with ID {}, while it's expected no exchanges to be returned",
-                            key, misbehaviorEx != null ? misbehaviorEx.getExchangeId() : "<null>");
-                    throw new OptimisticLockingException();
-                }
-            } else {
-                DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(newExchange, true,
-                        allowSerializedHeaders);
-                CompletableFuture<DeleteResponse> completableDeleteResponse = kvClient
-                        .delete(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                DeleteResponse deleteResponse = completableDeleteResponse.get();
-                if (deleteResponse.getDeleted() == 0) {
-                    LOG.warn(
-                            "Optimistic locking failed for exchange with key {}: kvClient.get returned no Exchanges, while it's expected to replace one",
-                            key);
-                    throw new OptimisticLockingException();
-                }
-                CompletableFuture<PutResponse> completablePutResponse = kvClient.put(
-                        ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()), convertToEtcd3Format(newHolder));
-                completablePutResponse.get();
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.error(e.getMessage(), e);
-            throw new OptimisticLockingException();
-        } catch (ExecutionException | IOException | ClassNotFoundException e) {
-            LOG.error(e.getMessage(), e);
-            throw new OptimisticLockingException();
-        }
-        LOG.trace("Added an Exchange with ID {} for key {} in optimistic manner.", newExchange.getExchangeId(), key);
-        return oldExchange;
-    }
-
-    @Override
-    public Exchange add(CamelContext camelContext, String key, Exchange exchange) {
-        if (optimistic) {
-            throw new UnsupportedOperationException();
-        }
-        LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
-        DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
-        CompletableFuture<GetResponse> completableResponse = kvClient
-                .get(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-        try {
-            GetResponse getResponse = completableResponse.get();
-            long modRevision = 0;
-            if (!getResponse.getKvs().isEmpty()) {
-                modRevision = getResponse.getKvs().get(0).getModRevision();
-            }
-            Txn transaction = kvClient.txn();
-            transaction
-                    .If(new Cmp(
-                            ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()),
-                            Cmp.Op.EQUAL,
-                            CmpTarget.modRevision(modRevision)))
-                    .Then(Op.put(ByteSequence
-                            .from(String.format("%s/%s", prefixName, key).getBytes()), convertToEtcd3Format(newHolder),
-                            PutOption.DEFAULT))
-                    .commit()
-                    .get();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        } catch (ExecutionException | IOException e) {
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        }
-        return unmarshallExchange(camelContext, newHolder);
-    }
-
-    @Override
-    public Set<String> scan(CamelContext camelContext) {
-        if (useRecovery) {
-            LOG.trace("Scanning for exchanges to recover in {} context", camelContext.getName());
-            CompletableFuture<GetResponse> completableGetResponse = kvClient.get(
-                    ByteSequence.from(persistencePrefixName.getBytes()),
-                    GetOption.newBuilder().withPrefix(ByteSequence.from(persistencePrefixName.getBytes())).build());
-            try {
-                GetResponse getResponse = completableGetResponse.get();
-                Set<String> keys = new TreeSet<>();
-                getResponse.getKvs().forEach(kv -> keys.add(new String(kv.getKey().getBytes())));
-                Set<String> scanned = Collections.unmodifiableSet(keys);
-                LOG.trace("Found {} keys for exchanges to recover in {} context", scanned.size(),
-                        camelContext.getName());
-                return scanned;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            } catch (ExecutionException e) {
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            }
-        } else {
-            LOG.warn(
-                    "What for to run recovery scans in {} context while prefix {} is running in non-recoverable aggregation repository mode?!",
-                    camelContext.getName(), prefixName);
-            return Collections.emptySet();
-        }
-    }
-
-    @Override
-    public Exchange recover(CamelContext camelContext, String exchangeId) {
-        LOG.trace("Recovering an Exchange with ID {}.", exchangeId);
-        CompletableFuture<GetResponse> completableResponse = kvClient
-                .get(ByteSequence.from(String.format("%s/%s", persistencePrefixName, exchangeId).getBytes()));
-        try {
-            GetResponse getResponse = completableResponse.get();
-            DefaultExchangeHolder holder
-                    = (DefaultExchangeHolder) convertFromEtcd3Format(getResponse.getKvs().get(0).getValue());
-            return useRecovery ? unmarshallExchange(camelContext, holder) : null;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        } catch (ExecutionException | IOException | ClassNotFoundException e) {
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void setRecoveryInterval(long interval, TimeUnit timeUnit) {
-        this.recoveryInterval = timeUnit.toMillis(interval);
-    }
-
-    @Override
-    public long getRecoveryInterval() {
-        return recoveryInterval;
-    }
-
-    @Override
-    public void setRecoveryInterval(long interval) {
-        this.recoveryInterval = interval;
-    }
-
-    @Override
-    public void setUseRecovery(boolean useRecovery) {
-        this.useRecovery = useRecovery;
-    }
-
-    @Override
-    public boolean isUseRecovery() {
-        return useRecovery;
-    }
-
-    @Override
-    public void setDeadLetterUri(String deadLetterUri) {
-        this.deadLetterUri = deadLetterUri;
-    }
-
-    @Override
-    public String getDeadLetterUri() {
-        return deadLetterUri;
-    }
-
-    @Override
-    public void setMaximumRedeliveries(int maximumRedeliveries) {
-        this.maximumRedeliveries = maximumRedeliveries;
-    }
-
-    @Override
-    public int getMaximumRedeliveries() {
-        return maximumRedeliveries;
-    }
-
-    public boolean isAllowSerializedHeaders() {
-        return allowSerializedHeaders;
-    }
-
-    public void setAllowSerializedHeaders(boolean allowSerializedHeaders) {
-        this.allowSerializedHeaders = allowSerializedHeaders;
-    }
-
-    public boolean isOptimistic() {
-        return optimistic;
-    }
-
-    public void setOptimistic(boolean optimistic) {
-        this.optimistic = optimistic;
-    }
-
-    public String getEndpoint() {
-        return endpoint;
-    }
-
-    public void setEndpoint(String endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public Client getClient() {
-        return client;
-    }
-
-    public void setClient(Client client) {
-        this.client = client;
-    }
-
-    public String getPrefixName() {
-        return prefixName;
-    }
-
-    public void setPrefixName(String prefixName) {
-        this.prefixName = prefixName;
-    }
-
-    @Override
-    public Exchange get(CamelContext camelContext, String key) {
-        CompletableFuture<GetResponse> completableResponse = kvClient
-                .get(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-        try {
-            GetResponse getResponse = completableResponse.get();
-            DefaultExchangeHolder holder = null;
-            if (!getResponse.getKvs().isEmpty()) {
-                holder = (DefaultExchangeHolder) convertFromEtcd3Format(getResponse.getKvs().get(0).getValue());
-            }
-            return unmarshallExchange(camelContext, holder);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        } catch (ExecutionException | IOException | ClassNotFoundException e) {
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void remove(CamelContext camelContext, String key, Exchange exchange) {
-        DefaultExchangeHolder holder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
-        if (optimistic) {
-            LOG.trace("Removing an exchange with ID {} for key {} in an optimistic manner.", exchange.getExchangeId(),
-                    key);
-            try {
-                CompletableFuture<GetResponse> completableGetResponse = kvClient
-                        .get(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                GetResponse getResponse = completableGetResponse.get();
-                List<KeyValue> keyValueList = getResponse.getKvs();
-                boolean optimisticLockingError = keyValueList.isEmpty();
-                if (!optimisticLockingError) {
-                    DefaultExchangeHolder holderFound = (DefaultExchangeHolder) convertFromEtcd3Format(
-                            keyValueList.get(0).getValue());
-                    optimisticLockingError = !Objects.equals(holder, holderFound);
-                    if (!optimisticLockingError) {
-                        CompletableFuture<DeleteResponse> completableDeleteResponse = kvClient
-                                .delete(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                        DeleteResponse deleteResponse = completableDeleteResponse.get();
-                        optimisticLockingError = deleteResponse.getDeleted() == 0;
-                    }
-                }
-                if (optimisticLockingError) {
-                    LOG.warn(
-                            "Optimistic locking failed for exchange with key {}: kvClient.delete removed no Exchanges, while it's expected to remove one.",
-                            key);
-                    throw new OptimisticLockingException();
-                }
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            } catch (ExecutionException | ClassNotFoundException | IOException e) {
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            }
-            LOG.trace("Removed an exchange with ID {} for key {} in an optimistic manner.", exchange.getExchangeId(),
-                    key);
-            if (useRecovery) {
-                LOG.trace(
-                        "Putting an exchange with ID {} for key {} into a recoverable storage in an optimistic manner.",
-                        exchange.getExchangeId(), key);
-                try {
-                    CompletableFuture<PutResponse> completablePutResponse = kvClient.put(
-                            ByteSequence.from(String.format("%s/%s", persistencePrefixName, key).getBytes()),
-                            convertToEtcd3Format(holder));
-                    completablePutResponse.get();
-                    LOG.trace(
-                            "Put an exchange with ID {} for key {} into a recoverable storage in an optimistic manner.",
-                            exchange.getExchangeId(), key);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    LOG.error(e.getMessage(), e);
-                    throw new RuntimeCamelException(e.getMessage(), e);
-                } catch (IOException | ExecutionException e) {
-                    LOG.error(e.getMessage(), e);
-                    throw new RuntimeCamelException(e.getMessage(), e);
-                }
-
-            }
-        } else {
-            if (useRecovery) {
-                LOG.trace("Removing an exchange with ID {} for key {} in a thread-safe manner.",
-                        exchange.getExchangeId(), key);
-                Txn transaction = kvClient.txn();
-                try {
-                    CompletableFuture<GetResponse> completableResponse = kvClient
-                            .get(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                    GetResponse getResponse = completableResponse.get();
-                    DefaultExchangeHolder removedHolder
-                            = (DefaultExchangeHolder) convertFromEtcd3Format(getResponse.getKvs().get(0).getValue());
-                    transaction
-                            .If(new Cmp(
-                                    ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()),
-                                    Cmp.Op.EQUAL,
-                                    CmpTarget.value(
-                                            ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()))))
-                            .Then(Op.delete(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()),
-                                    DeleteOption.DEFAULT),
-                                    Op.put(ByteSequence
-                                            .from(String.format("%s/%s", persistencePrefixName, key).getBytes()),
-                                            convertToEtcd3Format(removedHolder), PutOption.DEFAULT))
-                            .commit()
-                            .get();
-                    LOG.trace("Removed an exchange with ID {} for key {} in a thread-safe manner.",
-                            exchange.getExchangeId(), key);
-                    LOG.trace(
-                            "Put an exchange with ID {} for key {} into a recoverable storage in a thread-safe manner.",
-                            exchange.getExchangeId(), key);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    throw new RuntimeCamelException(e.getMessage(), e);
-                } catch (Exception exception) {
-                    throw new RuntimeCamelException(exception.getMessage(), exception);
-                }
-            } else {
-                CompletableFuture<DeleteResponse> completableDeleteResponse = kvClient
-                        .delete(ByteSequence.from(String.format("%s/%s", prefixName, key).getBytes()));
-                try {
-                    completableDeleteResponse.get();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    LOG.error(e.getMessage(), e);
-                    throw new RuntimeCamelException(e.getMessage(), e);
-                } catch (ExecutionException e) {
-                    LOG.error(e.getMessage(), e);
-                    throw new RuntimeCamelException(e.getMessage(), e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void confirm(CamelContext camelContext, String exchangeId) {
-        LOG.trace("Confirming an exchange with ID {}.", exchangeId);
-        if (useRecovery) {
-            CompletableFuture<DeleteResponse> completableDeleteResponse = kvClient
-                    .delete(ByteSequence.from(String.format("%s/%s", persistencePrefixName, exchangeId).getBytes()));
-            try {
-                completableDeleteResponse.get();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            } catch (ExecutionException e) {
-                LOG.error(e.getMessage(), e);
-                throw new RuntimeCamelException(e.getMessage(), e);
-            }
-        }
-    }
-
-    @Override
-    public Set<String> getKeys() {
-        CompletableFuture<GetResponse> completableGetResponse = kvClient.get(ByteSequence.from(prefixName.getBytes()),
-                GetOption.newBuilder().withRange(ByteSequence.from(prefixName.getBytes())).build());
-        Set<String> scanned;
-        try {
-            GetResponse getResponse = completableGetResponse.get();
-            Set<String> keys = new TreeSet<>();
-            getResponse.getKvs().forEach(kv -> keys.add(new String(kv.getKey().getBytes())));
-            scanned = Collections.unmodifiableSet(keys);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        } catch (ExecutionException e) {
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeCamelException(e.getMessage(), e);
-        }
-        return scanned;
-    }
-
-    @Override
-    protected void doInit() throws Exception {
-        StringHelper.notEmpty(prefixName, "prefixName");
-        if (maximumRedeliveries < 0) {
-            throw new IllegalArgumentException("Maximum redelivery retries must be zero or a positive integer.");
-        }
-        if (recoveryInterval < 0) {
-            throw new IllegalArgumentException("Recovery interval must be zero or a positive integer.");
-        }
-        if (persistencePrefixName == null && prefixName != null) {
-            this.persistencePrefixName = String.format("%s%s", prefixName, COMPLETED_SUFFIX);
-        }
-    }
-
-    @Override
-    protected void doStart() {
-        if (client == null) {
-            client = Client.builder().endpoints(endpoint).build();
-            shutdownClient = true;
-        }
-        kvClient = client.getKVClient();
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (client != null && shutdownClient) {
-            client.close();
-            client = null;
-        }
-    }
-
-    protected Exchange unmarshallExchange(CamelContext camelContext, DefaultExchangeHolder holder) {
-        Exchange exchange = null;
-        if (holder != null) {
-            exchange = new DefaultExchange(camelContext);
-            DefaultExchangeHolder.unmarshal(exchange, holder);
-        }
-        return exchange;
-    }
-
-    private Object convertFromEtcd3Format(ByteSequence value) throws IOException, ClassNotFoundException {
-        byte[] data = value.getBytes();
-        ByteArrayInputStream in = new ByteArrayInputStream(data);
-        ObjectInputStream is;
-        try {
-            is = new ObjectInputStream(in);
-            return is.readObject();
-        } catch (IOException | ClassNotFoundException e) {
-            LOG.error(e.getMessage(), e);
-            throw e;
-        }
-    }
-
-    private ByteSequence convertToEtcd3Format(Object value) throws IOException {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ObjectOutputStream oos;
-        try {
-            oos = new ObjectOutputStream(bos);
-            oos.writeObject(value);
-            oos.flush();
-            return ByteSequence.from(bos.toByteArray());
-        } catch (IOException e) {
-            LOG.error(e.getMessage(), e);
-            throw e;
-        }
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java
deleted file mode 100644
index d68db099909..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.etcd3.processor.aggregate.Etcd3AggregationRepository;
-import org.apache.camel.component.etcd3.support.Etcd3TestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-/**
- * The ABC example for using the Aggregator EIP.
- * <p/>
- * This example have 4 messages send to the aggregator, by which one message is published which contains the aggregation
- * of message 1,2 and 4 as they use the same correlation key.
- * <p/>
- */
-@Disabled("This is a manual test and should not run automatically")
-class AggregateEtcd3ManualTest extends Etcd3TestSupport {
-
-    @Test
-    void testABC() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("ABC");
-        template.sendBodyAndHeader("direct:start", "A", "myId", 1);
-        template.sendBodyAndHeader("direct:start", "B", "myId", 1);
-        template.sendBodyAndHeader("direct:start", "F", "myId", 2);
-        template.sendBodyAndHeader("direct:start", "C", "myId", 1);
-        MockEndpoint.assertIsSatisfied(context);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() {
-                from("direct:start")
-                        .log("Sending ${body} with correlation key ${header.myId}")
-                        .aggregate(header("myId"), new MyAggregationStrategy())
-                        .aggregationRepository(new Etcd3AggregationRepository("aggregation", service.getServiceAddress()))
-                        .completionSize(3)
-                        .log("Sending out ${body}")
-                        .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/MyAggregationStrategy.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/MyAggregationStrategy.java
deleted file mode 100644
index df02b215819..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/MyAggregationStrategy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3;
-
-import org.apache.camel.AggregationStrategy;
-import org.apache.camel.Exchange;
-
-/**
- * This is the aggregation strategy which is java code for <i>aggregating</i> incoming messages with the existing
- * aggregated message. In other words you use this strategy to <i>merge</i> the messages together.
- */
-public class MyAggregationStrategy implements AggregationStrategy {
-
-    /**
-     * Aggregates the messages.
-     *
-     * @param  oldExchange the existing aggregated message. Is <tt>null</tt> the very first time as there are no
-     *                     existing message.
-     * @param  newExchange the incoming message. This is never <tt>null</tt>.
-     * @return             the aggregated message.
-     */
-    public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
-        // the first time there are no existing message and therefore
-        // the oldExchange is null. In these cases we just return
-        // the newExchange
-        if (oldExchange == null) {
-            return newExchange;
-        }
-
-        // now we have both an existing message (oldExchange)
-        // and a incoming message (newExchange)
-        // we want to merge together.
-
-        // in this example we add their bodies
-        String oldBody = oldExchange.getIn().getBody(String.class).trim();
-        String newBody = newExchange.getIn().getBody(String.class).trim();
-
-        // the body should be the two bodies added together
-        String body = oldBody + newBody;
-
-        // update the existing message with the added body
-        oldExchange.getIn().setBody(body);
-        // and return it
-        return oldExchange;
-    }
-
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/cloud/integration/Etcd3ServiceDiscoveryIT.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/cloud/integration/Etcd3ServiceDiscoveryIT.java
deleted file mode 100644
index eb6fe306910..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/cloud/integration/Etcd3ServiceDiscoveryIT.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.cloud.integration;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.common.exception.EtcdException;
-import io.etcd.jetcd.options.DeleteOption;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.component.etcd3.Etcd3Configuration;
-import org.apache.camel.component.etcd3.Etcd3Helper;
-import org.apache.camel.component.etcd3.cloud.Etcd3OnDemandServiceDiscovery;
-import org.apache.camel.component.etcd3.cloud.Etcd3WatchServiceDiscovery;
-import org.apache.camel.component.etcd3.support.Etcd3TestSupport;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Disabled("Etcd3 is likely broken (see CAMEL-21439)")
-class Etcd3ServiceDiscoveryIT extends Etcd3TestSupport {
-    private static final ObjectMapper MAPPER = Etcd3Helper.createObjectMapper();
-    private static final AtomicInteger PORT = new AtomicInteger();
-
-    private Client client;
-    private Etcd3Configuration configuration;
-
-    @Override
-    public void doPreSetup() throws Exception {
-        configuration = new Etcd3Configuration();
-        configuration.setEndpoints(service.getServiceAddress());
-
-        client = getClient();
-        try {
-            client.getKVClient().delete(ByteSequence.from(configuration.getServicePath().getBytes()),
-                    DeleteOption.newBuilder().isPrefix(true).build()).get();
-        } catch (EtcdException e) {
-            // Ignore
-        }
-    }
-
-    @Override
-    protected void cleanupResources() throws Exception {
-        try {
-            client.getKVClient().delete(ByteSequence.from(configuration.getServicePath().getBytes()),
-                    DeleteOption.newBuilder().isPrefix(true).build()).get();
-            client.close();
-            client = null;
-        } catch (EtcdException e) {
-            // Ignore
-        }
-
-        super.cleanupResources();
-    }
-
-    @Test
-    void testOnDemandDiscovery() throws Exception {
-        for (int i = 0; i < 3; i++) {
-            addServer("serviceType-1");
-        }
-        for (int i = 0; i < 2; i++) {
-            addServer("serviceType-2");
-        }
-
-        try (Etcd3OnDemandServiceDiscovery strategy = new Etcd3OnDemandServiceDiscovery(configuration)) {
-            strategy.start();
-
-            List<ServiceDefinition> type1 = strategy.getServices("serviceType-1");
-            assertEquals(3, type1.size());
-            for (ServiceDefinition service : type1) {
-                assertNotNull(service.getMetadata());
-                assertTrue(service.getMetadata().containsKey("service_name"));
-                assertTrue(service.getMetadata().containsKey("port_delta"));
-            }
-
-            List<ServiceDefinition> type2 = strategy.getServices("serviceType-2");
-            assertEquals(2, type2.size());
-            for (ServiceDefinition service : type2) {
-                assertNotNull(service.getMetadata());
-                assertTrue(service.getMetadata().containsKey("service_name"));
-                assertTrue(service.getMetadata().containsKey("port_delta"));
-            }
-        }
-    }
-
-    @Test
-    void testWatchDiscovery() throws Exception {
-        addServer("serviceType-3");
-
-        try (Etcd3WatchServiceDiscovery strategy = new Etcd3WatchServiceDiscovery(configuration)) {
-            strategy.start();
-
-            assertEquals(1, strategy.getServices("serviceType-3").size());
-
-            addServer("serviceType-3");
-            addServer("serviceType-3");
-            addServer("serviceType-4");
-
-            await().atMost(1, SECONDS).untilAsserted(
-                    () -> assertEquals(3, strategy.getServices("serviceType-3").size()));
-        }
-    }
-
-    private void addServer(String name) throws Exception {
-        int port = PORT.incrementAndGet();
-
-        Map<String, String> tags = new HashMap<>();
-        tags.put("service_name", name);
-        tags.put("port_delta", Integer.toString(port));
-
-        Map<String, Object> server = new HashMap<>();
-        server.put("name", name);
-        server.put("address", "127.0.0.1");
-        server.put("port", 8000 + port);
-        server.put("tags", tags);
-
-        client.getKVClient().put(ByteSequence.from((configuration.getServicePath() + "service-" + port).getBytes()),
-                ByteSequence.from(MAPPER.writeValueAsString(server).getBytes())).get();
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ConsumerIT.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ConsumerIT.java
deleted file mode 100644
index 97e921c2e9f..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ConsumerIT.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.integration;
-
-import java.nio.charset.StandardCharsets;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.kv.GetResponse;
-import io.etcd.jetcd.options.GetOption;
-import io.etcd.jetcd.watch.WatchEvent;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.etcd3.Etcd3Constants;
-import org.apache.camel.component.etcd3.support.Etcd3TestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-@Disabled("Etcd3 is likely broken (see CAMEL-21439)")
-class Etcd3ConsumerIT extends Etcd3TestSupport {
-
-    private static final int BATCH_SIZE_PART_1 = 2_345;
-    private static final String ENCODING_TEST_KEY = "/éç";
-    private static final Processor NODE_TO_VALUE_IN_ISO_8859_1 = exchange -> {
-        WatchEvent event = exchange.getMessage().getBody(WatchEvent.class);
-        if (event != null) {
-            KeyValue keyValue = event.getKeyValue();
-            exchange.getMessage().setBody(keyValue.getKey().toString(StandardCharsets.ISO_8859_1) + "="
-                                          + keyValue.getValue().toString(StandardCharsets.ISO_8859_1));
-        }
-    };
-
-    @Test
-    void testWatchWithPath() throws Exception {
-        testWatch("mock:watch-with-path", "/myKey1", 10);
-    }
-
-    @Test
-    void testWatchWithConfigPath() throws Exception {
-        testWatch("mock:watch-with-config-path", "/myKey2", 11);
-    }
-
-    @Test
-    void testWatchPrefix() throws Exception {
-        testWatch("mock:watch-prefix", "/prefix/myKey1", 12);
-    }
-
-    @Test
-    void testWatchEncoding() throws Exception {
-        String value = "àè";
-        MockEndpoint mock = getMockEndpoint("mock:watch-encoding");
-        mock.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, ENCODING_TEST_KEY);
-        mock.expectedBodiesReceived(String.format("%s=%s", ENCODING_TEST_KEY, value));
-
-        final Client client = getClient();
-        client.getKVClient().put(
-                ByteSequence.from(ENCODING_TEST_KEY.getBytes(StandardCharsets.ISO_8859_1)),
-                ByteSequence.from(value.getBytes(StandardCharsets.ISO_8859_1))).get();
-
-        mock.assertIsSatisfied();
-    }
-
-    @Test
-    void testWatchRecovery() throws Exception {
-        final String key = "/myKeyRecovery";
-        final Client client = getClient();
-
-        final int batchSizePart2 = 13;
-        // Fill the vent backlog ( > 1000)
-        for (int i = 0; i < BATCH_SIZE_PART_1 + batchSizePart2; i++) {
-            client.getKVClient().put(ByteSequence.from(key.getBytes()), ByteSequence.from(("v" + i).getBytes())).get();
-            client.getKVClient().put(ByteSequence.from((key + "/" + i).getBytes()), ByteSequence.from("v".getBytes())).get();
-        }
-
-        final Object[] values = new String[batchSizePart2];
-        for (int i = 0; i < values.length; i++) {
-            values[i] = key + "=v" + (i + BATCH_SIZE_PART_1);
-        }
-        MockEndpoint mock = getMockEndpoint("mock:watch-recovery");
-        mock.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, key);
-        mock.expectedBodiesReceived(values);
-        context().getRouteController().startRoute("watchRecovery");
-
-        mock.assertIsSatisfied();
-    }
-
-    private void testWatch(String mockEndpoint, final String key, int updates) throws Exception {
-        final Object[] values = new String[updates];
-        for (int i = 0; i < updates; i++) {
-            values[i] = key + "=myValue-" + i;
-        }
-
-        MockEndpoint mock = getMockEndpoint(mockEndpoint);
-        mock.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, key);
-        mock.expectedBodiesReceivedInAnyOrder(values);
-
-        final Client client = getClient();
-        for (int i = 0; i < updates; i++) {
-            client.getKVClient().put(ByteSequence.from(key.getBytes()), ByteSequence.from(("myValue-" + i).getBytes())).get();
-        }
-
-        mock.assertIsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                GetResponse response = getClient().getKVClient().get(
-                        ByteSequence.from("/".getBytes()), GetOption.newBuilder().isPrefix(true).withCountOnly(true).build())
-                        .get();
-                // To make sure that the recovery test won't be affected by other tests
-                long toSkip = response.getCount() == 0 ? 0L : response.getHeader().getRevision();
-                from("etcd3:myKey1")
-                        .process(NODE_TO_VALUE_IN)
-                        .to("mock:watch-with-path");
-                fromF("etcd3:myKeyRecovery?fromIndex=%s", toSkip + 2 * BATCH_SIZE_PART_1 + 1)
-                        .id("watchRecovery")
-                        .autoStartup(false)
-                        .process(NODE_TO_VALUE_IN)
-                        .to("mock:watch-recovery");
-                from("etcd3:prefix?prefix=true")
-                        .process(NODE_TO_VALUE_IN)
-                        .to("log:org.apache.camel.component.etcd?level=INFO")
-                        .to("mock:watch-prefix");
-                from("etcd3:myKey2")
-                        .process(NODE_TO_VALUE_IN)
-                        .to("mock:watch-with-config-path");
-                fromF("etcd3:%s?keyCharset=ISO-8859-1", ENCODING_TEST_KEY)
-                        .process(NODE_TO_VALUE_IN_ISO_8859_1)
-                        .to("mock:watch-encoding");
-            }
-        };
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ProducerIT.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ProducerIT.java
deleted file mode 100644
index 22ecdc05f1c..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/integration/Etcd3ProducerIT.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.integration;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.kv.DeleteResponse;
-import io.etcd.jetcd.kv.GetResponse;
-import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.etcd3.Etcd3Constants;
-import org.apache.camel.component.etcd3.support.Etcd3TestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Disabled("Etcd3 is likely broken (see CAMEL-21439)")
-class Etcd3ProducerIT extends Etcd3TestSupport {
-
-    @Test
-    void testKeys() throws Exception {
-        final String path = "/camel/" + UUID.randomUUID();
-        final String value = UUID.randomUUID().toString();
-        final Client client = getClient();
-        final Map<String, Object> headers = new HashMap<>();
-
-        // *******************************************
-        // SET
-        // *******************************************
-
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_SET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-
-        MockEndpoint mockSet = getMockEndpoint("mock:result-set");
-        mockSet.expectedMessageCount(1);
-        mockSet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        sendBody("direct:keys-set", value, headers);
-        mockSet.assertIsSatisfied();
-
-        // *******************************************
-        // GET
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_GET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-
-        MockEndpoint mockGet = getMockEndpoint("mock:result-get");
-        mockGet.expectedMessageCount(1);
-        mockGet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        mockGet.expectedMessagesMatches(new Predicate() {
-            @Override
-            public boolean matches(Exchange exchange) {
-                GetResponse keysResponse = exchange.getIn().getBody(GetResponse.class);
-                assertNotNull(keysResponse);
-                assertEquals(1, keysResponse.getCount());
-                assertNotNull(keysResponse.getKvs());
-                assertFalse(keysResponse.getKvs().isEmpty());
-                ByteSequence actual = keysResponse.getKvs().get(0).getValue();
-                assertNotNull(actual);
-                return actual.toString().equals(value);
-            }
-        });
-
-        sendBody("direct:keys-get", value, headers);
-        mockGet.assertIsSatisfied();
-
-        // *******************************************
-        // DELETE
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_DELETE);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-
-        MockEndpoint mockDel = getMockEndpoint("mock:result-del");
-        mockDel.expectedMessageCount(1);
-        mockDel.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        sendBody("direct:keys-del", "value", headers);
-        mockDel.assertIsSatisfied();
-
-        // *******************************************
-        // VALIDATION
-        // *******************************************
-
-        GetResponse response = client.getKVClient().get(ByteSequence.from(path.getBytes())).get();
-        assertNotNull(response);
-        assertEquals(0, response.getCount());
-    }
-
-    @Test
-    void testEncoding() throws Exception {
-        final String path = "/âè/" + UUID.randomUUID();
-        final String value = "çà" + UUID.randomUUID();
-        final Map<String, Object> headers = new HashMap<>();
-
-        // *******************************************
-        // SET
-        // *******************************************
-
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_SET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-        headers.put(Etcd3Constants.ETCD_KEY_CHARSET, "ISO-8859-1");
-        headers.put(Etcd3Constants.ETCD_VALUE_CHARSET, "ISO-8859-1");
-
-        MockEndpoint mockSet = getMockEndpoint("mock:result-set");
-        mockSet.expectedMessageCount(1);
-        mockSet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        sendBody("direct:keys-set", value, headers);
-        mockSet.assertIsSatisfied();
-
-        // *******************************************
-        // GET
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_GET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-        headers.put(Etcd3Constants.ETCD_KEY_CHARSET, "ISO-8859-1");
-        headers.put(Etcd3Constants.ETCD_VALUE_CHARSET, "ISO-8859-1");
-
-        MockEndpoint mockGet = getMockEndpoint("mock:result-get");
-        mockGet.expectedMessageCount(1);
-        mockGet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        mockGet.expectedMessagesMatches(new Predicate() {
-            @Override
-            public boolean matches(Exchange exchange) {
-                GetResponse keysResponse = exchange.getIn().getBody(GetResponse.class);
-                assertNotNull(keysResponse);
-                assertEquals(1, keysResponse.getCount());
-                assertNotNull(keysResponse.getKvs());
-                assertFalse(keysResponse.getKvs().isEmpty());
-                ByteSequence actual = keysResponse.getKvs().get(0).getValue();
-                assertNotNull(actual);
-                return actual.toString(StandardCharsets.ISO_8859_1).equals(value);
-            }
-        });
-
-        sendBody("direct:keys-get", value, headers);
-        mockGet.assertIsSatisfied();
-
-        // *******************************************
-        // DELETE
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_DELETE);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-        headers.put(Etcd3Constants.ETCD_KEY_CHARSET, "ISO-8859-1");
-        headers.put(Etcd3Constants.ETCD_VALUE_CHARSET, "ISO-8859-1");
-
-        MockEndpoint mockDel = getMockEndpoint("mock:result-del");
-        mockDel.expectedMessageCount(1);
-        mockDel.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        sendBody("direct:keys-del", "value", headers);
-        mockDel.assertIsSatisfied();
-
-        // *******************************************
-        // VALIDATION
-        // *******************************************
-
-        GetResponse response = getClient().getKVClient().get(
-                ByteSequence.from(path, StandardCharsets.ISO_8859_1)).get();
-        assertNotNull(response);
-        assertEquals(0, response.getCount());
-    }
-
-    @Test
-    void testPrefix() throws Exception {
-        final String path = "/camel/" + UUID.randomUUID();
-        final String value = UUID.randomUUID().toString();
-        final Client client = getClient();
-        final Map<String, Object> headers = new HashMap<>();
-
-        // *******************************************
-        // SET
-        // *******************************************
-
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_SET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-
-        MockEndpoint mockSet = getMockEndpoint("mock:result-set");
-        mockSet.expectedMessageCount(1);
-        mockSet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        sendBody("direct:keys-set", value, headers);
-        mockSet.assertIsSatisfied();
-
-        final String pathChild = String.format("%s/child", path);
-        headers.put(Etcd3Constants.ETCD_PATH, pathChild);
-
-        mockSet.reset();
-        mockSet.expectedMessageCount(1);
-        mockSet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, pathChild);
-        sendBody("direct:keys-set", value, headers);
-        mockSet.assertIsSatisfied();
-
-        final String pathSiblingWithSamePrefix = String.format("%s-sibling", path);
-        headers.put(Etcd3Constants.ETCD_PATH, pathSiblingWithSamePrefix);
-
-        mockSet.reset();
-        mockSet.expectedMessageCount(1);
-        mockSet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, pathSiblingWithSamePrefix);
-        sendBody("direct:keys-set", value, headers);
-        mockSet.assertIsSatisfied();
-
-        // *******************************************
-        // GET
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_GET);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-
-        MockEndpoint mockGet = getMockEndpoint("mock:result-get");
-        mockGet.expectedMessageCount(1);
-        mockGet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        mockGet.expectedMessagesMatches(new Predicate() {
-            @Override
-            public boolean matches(Exchange exchange) {
-                GetResponse keysResponse = exchange.getIn().getBody(GetResponse.class);
-                assertNotNull(keysResponse);
-                assertEquals(1, keysResponse.getCount());
-                assertNotNull(keysResponse.getKvs());
-                assertFalse(keysResponse.getKvs().isEmpty());
-                ByteSequence actual = keysResponse.getKvs().get(0).getValue();
-                assertNotNull(actual);
-                return actual.toString().equals(value);
-            }
-        });
-
-        sendBody("direct:keys-get", value, headers);
-        mockGet.assertIsSatisfied();
-
-        headers.put(Etcd3Constants.ETCD_IS_PREFIX, true);
-
-        mockGet.reset();
-        mockGet.expectedMessageCount(1);
-        mockGet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        mockGet.expectedMessagesMatches(new Predicate() {
-            @Override
-            public boolean matches(Exchange exchange) {
-                GetResponse response = exchange.getIn().getBody(GetResponse.class);
-                assertNotNull(response);
-                assertEquals(3, response.getCount());
-                assertNotNull(response.getKvs());
-                assertEquals(3, response.getKvs().size());
-                Set<String> keys = new HashSet<>(List.of(path, pathChild, pathSiblingWithSamePrefix));
-                for (KeyValue kv : response.getKvs()) {
-                    ByteSequence actualValue = kv.getValue();
-                    assertNotNull(actualValue);
-                    assertEquals(value, actualValue.toString());
-                    assertTrue(keys.remove(kv.getKey().toString()));
-                }
-                assertTrue(keys.isEmpty());
-                return true;
-            }
-        });
-
-        sendBody("direct:keys-get", value, headers);
-        mockGet.assertIsSatisfied();
-
-        // *******************************************
-        // DELETE
-        // *******************************************
-
-        headers.clear();
-        headers.put(Etcd3Constants.ETCD_ACTION, Etcd3Constants.ETCD_KEYS_ACTION_DELETE);
-        headers.put(Etcd3Constants.ETCD_PATH, path);
-        headers.put(Etcd3Constants.ETCD_IS_PREFIX, true);
-
-        MockEndpoint mockDel = getMockEndpoint("mock:result-del");
-        mockDel.expectedMessageCount(1);
-        mockGet.expectedHeaderReceived(Etcd3Constants.ETCD_PATH, path);
-        mockGet.expectedMessagesMatches(new Predicate() {
-            @Override
-            public boolean matches(Exchange exchange) {
-                DeleteResponse response = exchange.getIn().getBody(DeleteResponse.class);
-                assertNotNull(response);
-                assertEquals(3, response.getDeleted());
-                return true;
-            }
-        });
-        sendBody("direct:keys-del", "value", headers);
-        mockDel.assertIsSatisfied();
-
-        // *******************************************
-        // VALIDATION
-        // *******************************************
-
-        GetResponse response = client.getKVClient().get(ByteSequence.from(path.getBytes())).get();
-        assertNotNull(response);
-        assertEquals(0, response.getCount());
-        response = client.getKVClient().get(ByteSequence.from(pathChild.getBytes())).get();
-        assertNotNull(response);
-        assertEquals(0, response.getCount());
-        response = client.getKVClient().get(ByteSequence.from(pathSiblingWithSamePrefix.getBytes())).get();
-        assertNotNull(response);
-        assertEquals(0, response.getCount());
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:keys-set")
-                        .to("etcd3:dummy")
-                        .to("mock:result-set");
-                from("direct:keys-get")
-                        .to("etcd3:dummy")
-                        .to("mock:result-get");
-                from("direct:keys-del")
-                        .to("etcd3:dummy")
-                        .to("mock:result-del");
-            }
-        };
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java
deleted file mode 100644
index cc0ccb5a47a..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.policy;
-
-import io.etcd.jetcd.ByteSequence;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.etcd3.support.Etcd3TestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Disabled("Etcd3 is likely broken (see CAMEL-21439)")
-class Etcd3RoutePolicyIT extends Etcd3TestSupport {
-
-    private Etcd3RoutePolicy policyAsLeader;
-    private Etcd3RoutePolicy policyAsNotLeader;
-
-    @AfterEach
-    public void cleanUp() throws Exception {
-        if (policyAsLeader != null) {
-            policyAsLeader.doStop();
-        }
-        if (policyAsNotLeader != null) {
-            policyAsNotLeader.doStop();
-        }
-    }
-
-    @Test
-    void testAsLeader() throws Exception {
-        await().atMost(10, SECONDS).untilAsserted(() -> assertTrue(policyAsLeader.isLeader()));
-        MockEndpoint mock = getMockEndpoint("mock:leader");
-        mock.expectedBodiesReceived("ABC");
-        template.sendBody("direct:leader", "ABC");
-        MockEndpoint.assertIsSatisfied(context);
-        getClient().getLeaseClient().revoke(policyAsLeader.getLeaseId());
-        getClient().getKVClient().put(
-                ByteSequence.from(policyAsLeader.getServicePath().getBytes()),
-                ByteSequence.from("not-leader".getBytes()))
-                .get();
-        await().atMost(10, SECONDS).untilAsserted(() -> assertFalse(policyAsLeader.isLeader()));
-    }
-
-    @Test
-    void testAsNotLeader() throws Exception {
-        await().atMost(10, SECONDS).untilAsserted(() -> assertFalse(policyAsNotLeader.isLeader()));
-        getClient().getKVClient().delete(
-                ByteSequence.from(policyAsNotLeader.getServicePath().getBytes())).get();
-        await().atMost(10, SECONDS).untilAsserted(() -> assertTrue(policyAsNotLeader.isLeader()));
-        MockEndpoint mock = getMockEndpoint("mock:not-leader");
-        mock.expectedBodiesReceived("DEF");
-        template.sendBody("direct:not-leader", "DEF");
-        MockEndpoint.assertIsSatisfied(context);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() throws Exception {
-                policyAsLeader = new Etcd3RoutePolicy(getClient());
-                policyAsLeader.setServicePath("/Etcd3RoutePolicyIT/leader");
-                policyAsLeader.setServiceName("leader");
-                policyAsLeader.setTtl(5);
-                from("direct:leader")
-                        .routePolicy(policyAsLeader)
-                        .id("as-leader")
-                        .to("mock:leader");
-                policyAsNotLeader = new Etcd3RoutePolicy(getClient());
-                policyAsNotLeader.setServicePath("/Etcd3RoutePolicyIT/not-leader");
-                policyAsNotLeader.setServiceName("not-leader");
-                policyAsNotLeader.setTtl(5);
-                getClient().getKVClient().put(
-                        ByteSequence.from(policyAsNotLeader.getServicePath().getBytes()),
-                        ByteSequence.from("leader".getBytes()))
-                        .get();
-                from("direct:not-leader")
-                        .routePolicy(policyAsNotLeader)
-                        .id("as-not-leader")
-                        .to("mock:not-leader");
-
-            }
-        };
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyMain.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyMain.java
deleted file mode 100644
index 02a15bcfbf8..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyMain.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.policy;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.etcd3.Etcd3Constants;
-import org.apache.camel.main.Main;
-
-public final class Etcd3RoutePolicyMain {
-
-    private Etcd3RoutePolicyMain() {
-    }
-
-    public static void main(final String[] args) throws Exception {
-        Main main = new Main();
-        main.configure().addRoutesBuilder(new RouteBuilder() {
-            public void configure() {
-                Etcd3RoutePolicy policy = new Etcd3RoutePolicy();
-                policy.setEndpoints(Etcd3Constants.ETCD_DEFAULT_ENDPOINTS);
-                policy.setServicePath("/camel/services/leader");
-                policy.setServiceName(args[0]);
-                policy.setTtl(15);
-
-                from("file:///tmp/camel?delete=true")
-                        .routeId(args[1])
-                        .routePolicy(policy)
-                        .setHeader("EtcdRouteID", constant(args[1]))
-                        .setHeader("EtcdServiceName", constant(args[0]))
-                        .to("log:org.apache.camel.component.etcd3?level=INFO&showAll=true");
-            }
-        });
-
-        main.run();
-    }
-}
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/support/Etcd3TestSupport.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/support/Etcd3TestSupport.java
deleted file mode 100644
index f2f0e647606..00000000000
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/support/Etcd3TestSupport.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.etcd3.support;
-
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.watch.WatchEvent;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Processor;
-import org.apache.camel.component.etcd3.Etcd3Component;
-import org.apache.camel.test.infra.etcd3.services.Etcd3Service;
-import org.apache.camel.test.infra.etcd3.services.Etcd3ServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-public abstract class Etcd3TestSupport extends CamelTestSupport {
-    @RegisterExtension
-    public static Etcd3Service service = Etcd3ServiceFactory.createService();
-
-    protected static final Processor NODE_TO_VALUE_IN = exchange -> {
-        WatchEvent event = exchange.getMessage().getBody(WatchEvent.class);
-        if (event != null) {
-            KeyValue keyValue = event.getKeyValue();
-            exchange.getMessage().setBody(keyValue.getKey() + "=" + keyValue.getValue());
-        }
-    };
-
-    protected Client getClient() {
-        return Client.builder().endpoints(service.getServiceAddress()).build();
-    }
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        Etcd3Component component = new Etcd3Component();
-        component.getConfiguration().setEndpoints(service.getServiceAddress());
-
-        CamelContext context = super.createCamelContext();
-        context.addComponent("etcd3", component);
-
-        return context;
-    }
-}
diff --git a/components/camel-etcd3/src/test/resources/log4j2.properties b/components/camel-etcd3/src/test/resources/log4j2.properties
deleted file mode 100644
index 2c2904a306e..00000000000
--- a/components/camel-etcd3/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/camel-etcd3-test.log
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.file.ref = file
diff --git a/components/pom.xml b/components/pom.xml
index 70812ba95a4..04dc0c26715 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -129,7 +129,6 @@
         <module>camel-elasticsearch</module>
         <module>camel-elasticsearch-rest-client</module>
         <module>camel-elytron</module>
-        <module>camel-etcd3</module>
         <module>camel-exec</module>
         <module>camel-fastjson</module>
         <module>camel-fhir</module>
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
index 6532b9c0f46..35e55b62419 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
@@ -97,7 +97,6 @@ dynamic-router-control
 ehcache
 elasticsearch
 elasticsearch-rest-client
-etcd3
 exec
 fhir
 file
diff --git a/docs/components/modules/ROOT/examples/json/etcd3.json b/docs/components/modules/ROOT/examples/json/etcd3.json
deleted file mode 120000
index f0f8dd41b31..00000000000
--- a/docs/components/modules/ROOT/examples/json/etcd3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-etcd3/src/generated/resources/META-INF/org/apache/camel/component/etcd3/etcd3.json
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 03ac8c17ce9..e094f43ea32 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -112,7 +112,6 @@
 ** xref:ehcache-component.adoc[Ehcache]
 ** xref:elasticsearch-component.adoc[Elasticsearch]
 ** xref:elasticsearch-rest-client-component.adoc[Elasticsearch Low level Rest Client]
-** xref:etcd3-component.adoc[Etcd v3]
 ** xref:exec-component.adoc[Exec]
 ** xref:fhir-component.adoc[FHIR]
 ** xref:file-component.adoc[File]
diff --git a/docs/components/modules/ROOT/pages/etcd3-component.adoc b/docs/components/modules/ROOT/pages/etcd3-component.adoc
deleted file mode 120000
index 74275e78ba2..00000000000
--- a/docs/components/modules/ROOT/pages/etcd3-component.adoc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../components/camel-etcd3/src/main/docs/etcd3-component.adoc
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_11.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_11.adoc
index 4d5d03a6af7..f3f74e3397d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_11.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_11.adoc
@@ -105,3 +105,6 @@ has been optimized to execute the entire batch operation in a single transaction
 on the SQL Connection, and doing a manual `commit` or `rollback`. This can dramatically improve performance
 on some databases. The old behaviour can be restored by setting the `batchAutoCommitDisabled=false` on the component or endpoint.
 
+=== camel-etcd3
+
+This deprecated component was removed in this release.
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 380dafbbd7d..494c15ec7b3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -1360,19 +1360,6 @@ public interface ComponentsBuilderFactory {
     static ElasticsearchRestClientComponentBuilderFactory.ElasticsearchRestClientComponentBuilder elasticsearchRestClient() {
         return ElasticsearchRestClientComponentBuilderFactory.elasticsearchRestClient();
     }
-    /**
-     * Etcd v3 (camel-etcd3)
-     * Get, set, delete or watch keys in etcd key-value store.
-     * 
-     * Category: clustering,database
-     * Since: 3.19
-     * Maven coordinates: org.apache.camel:camel-etcd3
-     * 
-     * @return the dsl builder
-     */
-    static Etcd3ComponentBuilderFactory.Etcd3ComponentBuilder etcd3() {
-        return Etcd3ComponentBuilderFactory.etcd3();
-    }
     /**
      * Exec (camel-exec)
      * Execute commands on the underlying operating system.
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java
deleted file mode 100644
index dc6be16fba6..00000000000
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-/*
- * 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.builder.component.dsl;
-
-import javax.annotation.processing.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.etcd3.Etcd3Component;
-
-/**
- * Get, set, delete or watch keys in etcd key-value store.
- * 
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface Etcd3ComponentBuilderFactory {
-
-    /**
-     * Etcd v3 (camel-etcd3)
-     * Get, set, delete or watch keys in etcd key-value store.
-     * 
-     * Category: clustering,database
-     * Since: 3.19
-     * Maven coordinates: org.apache.camel:camel-etcd3
-     * 
-     * @return the dsl builder
-     */
-    static Etcd3ComponentBuilder etcd3() {
-        return new Etcd3ComponentBuilderImpl();
-    }
-
-    /**
-     * Builder for the Etcd v3 component.
-     */
-    interface Etcd3ComponentBuilder extends ComponentBuilder<Etcd3Component> {
-    
-        /**
-         * Component configuration.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.etcd3.Etcd3Configuration&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param configuration the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder configuration(org.apache.camel.component.etcd3.Etcd3Configuration configuration) {
-            doSetProperty("configuration", configuration);
-            return this;
-        }
-    
-        
-        /**
-         * Configure etcd server endpoints using the IPNameResolver. Multiple
-         * endpoints can be separated by comma.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Default: http://localhost:2379
-         * Group: common
-         * 
-         * @param endpoints the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder endpoints(java.lang.String endpoints) {
-            doSetProperty("endpoints", endpoints);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the charset to use for the keys.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Default: UTF-8
-         * Group: common
-         * 
-         * @param keyCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder keyCharset(java.lang.String keyCharset) {
-            doSetProperty("keyCharset", keyCharset);
-            return this;
-        }
-    
-        /**
-         * Configure the namespace of keys used. / will be treated as no
-         * namespace.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param namespace the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder namespace(java.lang.String namespace) {
-            doSetProperty("namespace", namespace);
-            return this;
-        }
-    
-        
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder prefix(boolean prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-    
-        
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions (if possible) occurred while the Camel
-         * consumer is trying to pickup incoming messages, or the likes, will
-         * now be processed as a message and handled by the routing Error
-         * Handler. Important: This is only possible if the 3rd party component
-         * allows Camel to be alerted if an exception was thrown. Some
-         * components handle this internally only, and therefore
-         * bridgeErrorHandler is not possible. In other situations we may
-         * improve the Camel component to hook into the 3rd party component and
-         * make this possible for future releases. 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: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: consumer
-         * 
-         * @param bridgeErrorHandler the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-    
-        /**
-         * The index to watch from.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param fromIndex the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder fromIndex(long fromIndex) {
-            doSetProperty("fromIndex", fromIndex);
-            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.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder lazyStartProducer(boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the charset to use for the values.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Default: UTF-8
-         * Group: producer
-         * 
-         * @param valueCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder valueCharset(java.lang.String valueCharset) {
-            doSetProperty("valueCharset", valueCharset);
-            return this;
-        }
-    
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: &lt;code&gt;java.util.Map&amp;lt;java.lang.String,
-         * java.lang.String&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param authHeaders the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder authHeaders(java.util.Map<java.lang.String, java.lang.String> authHeaders) {
-            doSetProperty("authHeaders", authHeaders);
-            return this;
-        }
-    
-        /**
-         * Configure the authority used to authenticate connections to servers.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param authority the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder authority(java.lang.String authority) {
-            doSetProperty("authority", authority);
-            return this;
-        }
-    
-        
-        /**
-         * Whether autowiring is enabled. This is used for automatic autowiring
-         * options (the option must be marked as autowired) by looking up in the
-         * registry to find if there is a single instance of matching type,
-         * which then gets configured on the component. This can be used for
-         * automatic configuring JDBC data sources, JMS connection factories,
-         * AWS Clients, etc.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param autowiredEnabled the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder autowiredEnabled(boolean autowiredEnabled) {
-            doSetProperty("autowiredEnabled", autowiredEnabled);
-            return this;
-        }
-    
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option is a: &lt;code&gt;java.time.Duration&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder connectionTimeout(java.time.Duration connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-    
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: &lt;code&gt;java.util.Map&amp;lt;java.lang.String,
-         * java.lang.String&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param headers the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder headers(java.util.Map<java.lang.String, java.lang.String> headers) {
-            doSetProperty("headers", headers);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option is a: &lt;code&gt;java.time.Duration&lt;/code&gt; type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder keepAliveTime(java.time.Duration keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option is a: &lt;code&gt;java.time.Duration&lt;/code&gt; type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder keepAliveTimeout(java.time.Duration keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-    
-        /**
-         * Configure etcd load balancer policy.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param loadBalancerPolicy the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder loadBalancerPolicy(java.lang.String loadBalancerPolicy) {
-            doSetProperty("loadBalancerPolicy", loadBalancerPolicy);
-            return this;
-        }
-    
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder maxInboundMessageSize(java.lang.Integer maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder retryDelay(long retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-    
-        
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option is a: &lt;code&gt;long&lt;/code&gt; type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder retryMaxDelay(long retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-    
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option is a: &lt;code&gt;java.time.Duration&lt;/code&gt; type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder retryMaxDuration(java.time.Duration retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-    
-        
-        /**
-         * The path to look for service discovery.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Default: /services/
-         * Group: cloud
-         * 
-         * @param servicePath the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder servicePath(java.lang.String servicePath) {
-            doSetProperty("servicePath", servicePath);
-            return this;
-        }
-    
-        /**
-         * Configure etcd auth password.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder password(java.lang.String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-    
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option is a:
-         * &lt;code&gt;io.netty.handler.ssl.SslContext&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder sslContext(io.netty.handler.ssl.SslContext sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-    
-        /**
-         * Configure etcd auth user.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param userName the value to set
-         * @return the dsl builder
-         */
-        default Etcd3ComponentBuilder userName(java.lang.String userName) {
-            doSetProperty("userName", userName);
-            return this;
-        }
-    }
-
-    class Etcd3ComponentBuilderImpl
-            extends AbstractComponentBuilder<Etcd3Component>
-            implements Etcd3ComponentBuilder {
-        @Override
-        protected Etcd3Component buildConcreteComponent() {
-            return new Etcd3Component();
-        }
-        private org.apache.camel.component.etcd3.Etcd3Configuration getOrCreateConfiguration(Etcd3Component component) {
-            if (component.getConfiguration() == null) {
-                component.setConfiguration(new org.apache.camel.component.etcd3.Etcd3Configuration());
-            }
-            return component.getConfiguration();
-        }
-        @Override
-        protected boolean setPropertyOnComponent(
-                Component component,
-                String name,
-                Object value) {
-            switch (name) {
-            case "configuration": ((Etcd3Component) component).setConfiguration((org.apache.camel.component.etcd3.Etcd3Configuration) value); return true;
-            case "endpoints": getOrCreateConfiguration((Etcd3Component) component).setEndpoints((java.lang.String) value); return true;
-            case "keyCharset": getOrCreateConfiguration((Etcd3Component) component).setKeyCharset((java.lang.String) value); return true;
-            case "namespace": getOrCreateConfiguration((Etcd3Component) component).setNamespace((java.lang.String) value); return true;
-            case "prefix": getOrCreateConfiguration((Etcd3Component) component).setPrefix((boolean) value); return true;
-            case "bridgeErrorHandler": ((Etcd3Component) component).setBridgeErrorHandler((boolean) value); return true;
-            case "fromIndex": getOrCreateConfiguration((Etcd3Component) component).setFromIndex((long) value); return true;
-            case "lazyStartProducer": ((Etcd3Component) component).setLazyStartProducer((boolean) value); return true;
-            case "valueCharset": getOrCreateConfiguration((Etcd3Component) component).setValueCharset((java.lang.String) value); return true;
-            case "authHeaders": getOrCreateConfiguration((Etcd3Component) component).setAuthHeaders((java.util.Map) value); return true;
-            case "authority": getOrCreateConfiguration((Etcd3Component) component).setAuthority((java.lang.String) value); return true;
-            case "autowiredEnabled": ((Etcd3Component) component).setAutowiredEnabled((boolean) value); return true;
-            case "connectionTimeout": getOrCreateConfiguration((Etcd3Component) component).setConnectionTimeout((java.time.Duration) value); return true;
-            case "headers": getOrCreateConfiguration((Etcd3Component) component).setHeaders((java.util.Map) value); return true;
-            case "keepAliveTime": getOrCreateConfiguration((Etcd3Component) component).setKeepAliveTime((java.time.Duration) value); return true;
-            case "keepAliveTimeout": getOrCreateConfiguration((Etcd3Component) component).setKeepAliveTimeout((java.time.Duration) value); return true;
-            case "loadBalancerPolicy": getOrCreateConfiguration((Etcd3Component) component).setLoadBalancerPolicy((java.lang.String) value); return true;
-            case "maxInboundMessageSize": getOrCreateConfiguration((Etcd3Component) component).setMaxInboundMessageSize((java.lang.Integer) value); return true;
-            case "retryDelay": getOrCreateConfiguration((Etcd3Component) component).setRetryDelay((long) value); return true;
-            case "retryMaxDelay": getOrCreateConfiguration((Etcd3Component) component).setRetryMaxDelay((long) value); return true;
-            case "retryMaxDuration": getOrCreateConfiguration((Etcd3Component) component).setRetryMaxDuration((java.time.Duration) value); return true;
-            case "servicePath": getOrCreateConfiguration((Etcd3Component) component).setServicePath((java.lang.String) value); return true;
-            case "password": getOrCreateConfiguration((Etcd3Component) component).setPassword((java.lang.String) value); return true;
-            case "sslContext": getOrCreateConfiguration((Etcd3Component) component).setSslContext((io.netty.handler.ssl.SslContext) value); return true;
-            case "userName": getOrCreateConfiguration((Etcd3Component) component).setUserName((java.lang.String) value); return true;
-            default: return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 69d76b35955..3c46d71b3b1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -104,7 +104,6 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.EhcacheEndpointBuilderFactory.EhcacheBuilders,
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchBuilders,
             org.apache.camel.builder.endpoint.dsl.ElasticsearchRestClientEndpointBuilderFactory.ElasticsearchRestClientBuilders,
-            org.apache.camel.builder.endpoint.dsl.Etcd3EndpointBuilderFactory.Etcd3Builders,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory.EventBuilders,
             org.apache.camel.builder.endpoint.dsl.EventHubsEndpointBuilderFactory.EventHubsBuilders,
             org.apache.camel.builder.endpoint.dsl.EventbridgeEndpointBuilderFactory.EventbridgeBuilders,
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index 8ac0c896c1d..d5ee76b2ee9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -101,7 +101,6 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.EhcacheEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElasticsearchRestClientEndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.Etcd3EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventHubsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventbridgeEndpointBuilderFactory,
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 0bae9b80d06..2cb7eee4d0e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -4363,48 +4363,6 @@ public class StaticEndpointBuilders {
     public static ElasticsearchRestClientEndpointBuilderFactory.ElasticsearchRestClientEndpointBuilder elasticsearchRestClient(String componentName, String path) {
         return ElasticsearchRestClientEndpointBuilderFactory.endpointBuilder(componentName, path);
     }
-    /**
-     * Etcd v3 (camel-etcd3)
-     * Get, set, delete or watch keys in etcd key-value store.
-     * 
-     * Category: clustering,database
-     * Since: 3.19
-     * Maven coordinates: org.apache.camel:camel-etcd3
-     * 
-     * Syntax: <code>etcd3:path</code>
-     * 
-     * Path parameter: path
-     * The path the endpoint refers to
-     * 
-     * @param path path
-     * @return the dsl builder
-     */
-    @Deprecated
-    public static Etcd3EndpointBuilderFactory.Etcd3EndpointBuilder etcd3(String path) {
-        return etcd3("etcd3", path);
-    }
-    /**
-     * Etcd v3 (camel-etcd3)
-     * Get, set, delete or watch keys in etcd key-value store.
-     * 
-     * Category: clustering,database
-     * Since: 3.19
-     * Maven coordinates: org.apache.camel:camel-etcd3
-     * 
-     * Syntax: <code>etcd3:path</code>
-     * 
-     * Path parameter: path
-     * The path the endpoint refers to
-     * 
-     * @param componentName to use a custom component name for the endpoint
-     * instead of the default name
-     * @param path path
-     * @return the dsl builder
-     */
-    @Deprecated
-    public static Etcd3EndpointBuilderFactory.Etcd3EndpointBuilder etcd3(String componentName, String path) {
-        return Etcd3EndpointBuilderFactory.endpointBuilder(componentName, path);
-    }
     /**
      * Exec (camel-exec)
      * Execute commands on the underlying operating system.
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
deleted file mode 100644
index 9768a7102ea..00000000000
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
+++ /dev/null
@@ -1,1843 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-/*
- * 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.builder.endpoint.dsl;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.*;
-import java.util.stream.*;
-import javax.annotation.processing.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-
-/**
- * Get, set, delete or watch keys in etcd key-value store.
- * 
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface Etcd3EndpointBuilderFactory {
-
-    /**
-     * Builder for endpoint consumers for the Etcd v3 component.
-     */
-    public interface Etcd3EndpointConsumerBuilder
-            extends
-                EndpointConsumerBuilder {
-        default AdvancedEtcd3EndpointConsumerBuilder advanced() {
-            return (AdvancedEtcd3EndpointConsumerBuilder) this;
-        }
-        /**
-         * Configure etcd server endpoints using the IPNameResolver. Multiple
-         * endpoints can be separated by comma.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: http://localhost:2379
-         * Group: common
-         * 
-         * @param endpoints the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder endpoints(String endpoints) {
-            doSetProperty("endpoints", endpoints);
-            return this;
-        }
-        /**
-         * Configure the charset to use for the keys.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: UTF-8
-         * Group: common
-         * 
-         * @param keyCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder keyCharset(String keyCharset) {
-            doSetProperty("keyCharset", keyCharset);
-            return this;
-        }
-        /**
-         * Configure the namespace of keys used. / will be treated as no
-         * namespace.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param namespace the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder namespace(String namespace) {
-            doSetProperty("namespace", namespace);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder prefix(boolean prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder prefix(String prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * The path to look for service discovery.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: /services/
-         * Group: cloud
-         * 
-         * @param servicePath the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder servicePath(String servicePath) {
-            doSetProperty("servicePath", servicePath);
-            return this;
-        }
-        /**
-         * Configure etcd auth password.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Configure etcd auth user.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param userName the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointConsumerBuilder userName(String userName) {
-            doSetProperty("userName", userName);
-            return this;
-        }
-    }
-
-    /**
-     * Advanced builder for endpoint consumers for the Etcd v3 component.
-     */
-    public interface AdvancedEtcd3EndpointConsumerBuilder
-            extends
-                EndpointConsumerBuilder {
-        default Etcd3EndpointConsumerBuilder basic() {
-            return (Etcd3EndpointConsumerBuilder) this;
-        }
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions (if possible) occurred while the Camel
-         * consumer is trying to pickup incoming messages, or the likes, will
-         * now be processed as a message and handled by the routing Error
-         * Handler. Important: This is only possible if the 3rd party component
-         * allows Camel to be alerted if an exception was thrown. Some
-         * components handle this internally only, and therefore
-         * bridgeErrorHandler is not possible. In other situations we may
-         * improve the Camel component to hook into the 3rd party component and
-         * make this possible for future releases. 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 (advanced)
-         * 
-         * @param bridgeErrorHandler the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions (if possible) occurred while the Camel
-         * consumer is trying to pickup incoming messages, or the likes, will
-         * now be processed as a message and handled by the routing Error
-         * Handler. Important: This is only possible if the 3rd party component
-         * allows Camel to be alerted if an exception was thrown. Some
-         * components handle this internally only, and therefore
-         * bridgeErrorHandler is not possible. In other situations we may
-         * improve the Camel component to hook into the 3rd party component and
-         * make this possible for future releases. 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 (advanced)
-         * 
-         * @param bridgeErrorHandler the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            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
-         * logged at WARN or ERROR level and ignored.
-         * 
-         * The option is a: <code>org.apache.camel.spi.ExceptionHandler</code>
-         * type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param exceptionHandler the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder exceptionHandler(org.apache.camel.spi.ExceptionHandler exceptionHandler) {
-            doSetProperty("exceptionHandler", exceptionHandler);
-            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
-         * logged at WARN or ERROR level and ignored.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param exceptionHandler the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder exceptionHandler(String exceptionHandler) {
-            doSetProperty("exceptionHandler", exceptionHandler);
-            return this;
-        }
-        /**
-         * Sets the exchange pattern when the consumer creates an exchange.
-         * 
-         * The option is a: <code>org.apache.camel.ExchangePattern</code> type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param exchangePattern the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder exchangePattern(org.apache.camel.ExchangePattern exchangePattern) {
-            doSetProperty("exchangePattern", exchangePattern);
-            return this;
-        }
-        /**
-         * Sets the exchange pattern when the consumer creates an exchange.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.ExchangePattern</code> type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param exchangePattern the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder 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)
-         * 
-         * @param fromIndex the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder 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)
-         * 
-         * @param fromIndex the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder fromIndex(String fromIndex) {
-            doSetProperty("fromIndex", fromIndex);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder authHeaders(String key, Object value) {
-            doSetMultiValueProperty("authHeaders", "authHeaders." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder authHeaders(Map values) {
-            doSetMultiValueProperties("authHeaders", "authHeaders.", values);
-            return this;
-        }
-        /**
-         * Configure the authority used to authenticate connections to servers.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param authority the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder authority(String authority) {
-            doSetProperty("authority", authority);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder connectionTimeout(java.time.Duration connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder connectionTimeout(String connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder headers(String key, Object value) {
-            doSetMultiValueProperty("headers", "headers." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder headers(Map values) {
-            doSetMultiValueProperties("headers", "headers.", values);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder keepAliveTime(java.time.Duration keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder keepAliveTime(String keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder keepAliveTimeout(java.time.Duration keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder keepAliveTimeout(String keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure etcd load balancer policy.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param loadBalancerPolicy the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder loadBalancerPolicy(String loadBalancerPolicy) {
-            doSetProperty("loadBalancerPolicy", loadBalancerPolicy);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder maxInboundMessageSize(Integer maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder maxInboundMessageSize(String maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryDelay(long retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryDelay(String retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryMaxDelay(long retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryMaxDelay(String retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryMaxDuration(java.time.Duration retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder retryMaxDuration(String retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option is a: <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder sslContext(io.netty.handler.ssl.SslContext sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option will be converted to a
-         * <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointConsumerBuilder sslContext(String sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-    }
-
-    /**
-     * Builder for endpoint producers for the Etcd v3 component.
-     */
-    public interface Etcd3EndpointProducerBuilder
-            extends
-                EndpointProducerBuilder {
-        default AdvancedEtcd3EndpointProducerBuilder advanced() {
-            return (AdvancedEtcd3EndpointProducerBuilder) this;
-        }
-
-        /**
-         * Configure etcd server endpoints using the IPNameResolver. Multiple
-         * endpoints can be separated by comma.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: http://localhost:2379
-         * Group: common
-         * 
-         * @param endpoints the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder endpoints(String endpoints) {
-            doSetProperty("endpoints", endpoints);
-            return this;
-        }
-        /**
-         * Configure the charset to use for the keys.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: UTF-8
-         * Group: common
-         * 
-         * @param keyCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder keyCharset(String keyCharset) {
-            doSetProperty("keyCharset", keyCharset);
-            return this;
-        }
-        /**
-         * Configure the namespace of keys used. / will be treated as no
-         * namespace.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param namespace the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder namespace(String namespace) {
-            doSetProperty("namespace", namespace);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder prefix(boolean prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder prefix(String prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * Configure the charset to use for the values.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: UTF-8
-         * Group: producer
-         * 
-         * @param valueCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder valueCharset(String valueCharset) {
-            doSetProperty("valueCharset", valueCharset);
-            return this;
-        }
-        /**
-         * The path to look for service discovery.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: /services/
-         * Group: cloud
-         * 
-         * @param servicePath the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder servicePath(String servicePath) {
-            doSetProperty("servicePath", servicePath);
-            return this;
-        }
-        /**
-         * Configure etcd auth password.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Configure etcd auth user.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param userName the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointProducerBuilder userName(String userName) {
-            doSetProperty("userName", userName);
-            return this;
-        }
-    }
-
-    /**
-     * Advanced builder for endpoint producers for the Etcd v3 component.
-     */
-    public interface AdvancedEtcd3EndpointProducerBuilder extends EndpointProducerBuilder {
-        default Etcd3EndpointProducerBuilder basic() {
-            return (Etcd3EndpointProducerBuilder) 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.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: producer (advanced)
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder lazyStartProducer(boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            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.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: producer (advanced)
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder lazyStartProducer(String lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder authHeaders(String key, Object value) {
-            doSetMultiValueProperty("authHeaders", "authHeaders." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder authHeaders(Map values) {
-            doSetMultiValueProperties("authHeaders", "authHeaders.", values);
-            return this;
-        }
-        /**
-         * Configure the authority used to authenticate connections to servers.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param authority the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder authority(String authority) {
-            doSetProperty("authority", authority);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder connectionTimeout(java.time.Duration connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder connectionTimeout(String connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder headers(String key, Object value) {
-            doSetMultiValueProperty("headers", "headers." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder headers(Map values) {
-            doSetMultiValueProperties("headers", "headers.", values);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder keepAliveTime(java.time.Duration keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder keepAliveTime(String keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder keepAliveTimeout(java.time.Duration keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder keepAliveTimeout(String keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure etcd load balancer policy.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param loadBalancerPolicy the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder loadBalancerPolicy(String loadBalancerPolicy) {
-            doSetProperty("loadBalancerPolicy", loadBalancerPolicy);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder maxInboundMessageSize(Integer maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder maxInboundMessageSize(String maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryDelay(long retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryDelay(String retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryMaxDelay(long retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryMaxDelay(String retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryMaxDuration(java.time.Duration retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder retryMaxDuration(String retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option is a: <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder sslContext(io.netty.handler.ssl.SslContext sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option will be converted to a
-         * <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointProducerBuilder sslContext(String sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-    }
-
-    /**
-     * Builder for endpoint for the Etcd v3 component.
-     */
-    public interface Etcd3EndpointBuilder
-            extends
-                Etcd3EndpointConsumerBuilder,
-                Etcd3EndpointProducerBuilder {
-        default AdvancedEtcd3EndpointBuilder advanced() {
-            return (AdvancedEtcd3EndpointBuilder) this;
-        }
-
-        /**
-         * Configure etcd server endpoints using the IPNameResolver. Multiple
-         * endpoints can be separated by comma.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: http://localhost:2379
-         * Group: common
-         * 
-         * @param endpoints the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder endpoints(String endpoints) {
-            doSetProperty("endpoints", endpoints);
-            return this;
-        }
-        /**
-         * Configure the charset to use for the keys.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: UTF-8
-         * Group: common
-         * 
-         * @param keyCharset the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder keyCharset(String keyCharset) {
-            doSetProperty("keyCharset", keyCharset);
-            return this;
-        }
-        /**
-         * Configure the namespace of keys used. / will be treated as no
-         * namespace.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param namespace the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder namespace(String namespace) {
-            doSetProperty("namespace", namespace);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder prefix(boolean prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param prefix the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder prefix(String prefix) {
-            doSetProperty("prefix", prefix);
-            return this;
-        }
-        /**
-         * The path to look for service discovery.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: /services/
-         * Group: cloud
-         * 
-         * @param servicePath the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder servicePath(String servicePath) {
-            doSetProperty("servicePath", servicePath);
-            return this;
-        }
-        /**
-         * Configure etcd auth password.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Configure etcd auth user.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         * 
-         * @param userName the value to set
-         * @return the dsl builder
-         */
-        default Etcd3EndpointBuilder userName(String userName) {
-            doSetProperty("userName", userName);
-            return this;
-        }
-    }
-
-    /**
-     * Advanced builder for endpoint for the Etcd v3 component.
-     */
-    public interface AdvancedEtcd3EndpointBuilder
-            extends
-                AdvancedEtcd3EndpointConsumerBuilder,
-                AdvancedEtcd3EndpointProducerBuilder {
-        default Etcd3EndpointBuilder basic() {
-            return (Etcd3EndpointBuilder) this;
-        }
-
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder authHeaders(String key, Object value) {
-            doSetMultiValueProperty("authHeaders", "authHeaders." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to auth request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the authHeaders(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder authHeaders(Map values) {
-            doSetMultiValueProperties("authHeaders", "authHeaders.", values);
-            return this;
-        }
-        /**
-         * Configure the authority used to authenticate connections to servers.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param authority the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder authority(String authority) {
-            doSetProperty("authority", authority);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder connectionTimeout(java.time.Duration connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the connection timeout.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder connectionTimeout(String connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param key the option key
-         * @param value the option value
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder headers(String key, Object value) {
-            doSetMultiValueProperty("headers", "headers." + key, value);
-            return this;
-        }
-        /**
-         * Configure the headers to be added to http request headers.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.String&gt;</code> type.
-         * The option is multivalued, and you can use the headers(String,
-         * Object) method to add a value (call the method multiple times to set
-         * more values).
-         * 
-         * Group: advanced
-         * 
-         * @param values the values
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder headers(Map values) {
-            doSetMultiValueProperties("headers", "headers.", values);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder keepAliveTime(java.time.Duration keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the interval for gRPC keepalives. The current minimum
-         * allowed by gRPC is 10 seconds.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 30 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTime the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder keepAliveTime(String keepAliveTime) {
-            doSetProperty("keepAliveTime", keepAliveTime);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder keepAliveTimeout(java.time.Duration keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure the timeout for gRPC keepalives.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Default: 10 seconds
-         * Group: advanced
-         * 
-         * @param keepAliveTimeout the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder keepAliveTimeout(String keepAliveTimeout) {
-            doSetProperty("keepAliveTimeout", keepAliveTimeout);
-            return this;
-        }
-        /**
-         * Configure etcd load balancer policy.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param loadBalancerPolicy the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder loadBalancerPolicy(String loadBalancerPolicy) {
-            doSetProperty("loadBalancerPolicy", loadBalancerPolicy);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder maxInboundMessageSize(Integer maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the maximum message size allowed for a single gRPC frame.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param maxInboundMessageSize the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder maxInboundMessageSize(String maxInboundMessageSize) {
-            doSetProperty("maxInboundMessageSize", maxInboundMessageSize);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryDelay(long retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 500
-         * Group: advanced
-         * 
-         * @param retryDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryDelay(String retryDelay) {
-            doSetProperty("retryDelay", retryDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryMaxDelay(long retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the max backing off delay between retries in milliseconds.
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 2500
-         * Group: advanced
-         * 
-         * @param retryMaxDelay the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryMaxDelay(String retryMaxDelay) {
-            doSetProperty("retryMaxDelay", retryMaxDelay);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option is a: <code>java.time.Duration</code> type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryMaxDuration(java.time.Duration retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure the retries max duration.
-         * 
-         * The option will be converted to a <code>java.time.Duration</code>
-         * type.
-         * 
-         * Group: advanced
-         * 
-         * @param retryMaxDuration the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder retryMaxDuration(String retryMaxDuration) {
-            doSetProperty("retryMaxDuration", retryMaxDuration);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option is a: <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder sslContext(io.netty.handler.ssl.SslContext sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-        /**
-         * Configure SSL/TLS context to use instead of the system default.
-         * 
-         * The option will be converted to a
-         * <code>io.netty.handler.ssl.SslContext</code> type.
-         * 
-         * Group: security
-         * 
-         * @param sslContext the value to set
-         * @return the dsl builder
-         */
-        default AdvancedEtcd3EndpointBuilder sslContext(String sslContext) {
-            doSetProperty("sslContext", sslContext);
-            return this;
-        }
-    }
-
-    public interface Etcd3Builders {
-        /**
-         * Etcd v3 (camel-etcd3)
-         * Get, set, delete or watch keys in etcd key-value store.
-         * 
-         * Category: clustering,database
-         * Since: 3.19
-         * Maven coordinates: org.apache.camel:camel-etcd3
-         * 
-         * @return the dsl builder for the headers' name.
-         */
-        @Deprecated
-        default Etcd3HeaderNameBuilder etcd3() {
-            return Etcd3HeaderNameBuilder.INSTANCE;
-        }
-        /**
-         * Etcd v3 (camel-etcd3)
-         * Get, set, delete or watch keys in etcd key-value store.
-         * 
-         * Category: clustering,database
-         * Since: 3.19
-         * Maven coordinates: org.apache.camel:camel-etcd3
-         * 
-         * Syntax: <code>etcd3:path</code>
-         * 
-         * Path parameter: path
-         * The path the endpoint refers to
-         * 
-         * @param path path
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Etcd3EndpointBuilder etcd3(String path) {
-            return Etcd3EndpointBuilderFactory.endpointBuilder("etcd3", path);
-        }
-        /**
-         * Etcd v3 (camel-etcd3)
-         * Get, set, delete or watch keys in etcd key-value store.
-         * 
-         * Category: clustering,database
-         * Since: 3.19
-         * Maven coordinates: org.apache.camel:camel-etcd3
-         * 
-         * Syntax: <code>etcd3:path</code>
-         * 
-         * Path parameter: path
-         * The path the endpoint refers to
-         * 
-         * @param componentName to use a custom component name for the endpoint
-         * instead of the default name
-         * @param path path
-         * @return the dsl builder
-         */
-        @Deprecated
-        default Etcd3EndpointBuilder etcd3(String componentName, String path) {
-            return Etcd3EndpointBuilderFactory.endpointBuilder(componentName, path);
-        }
-
-    }
-    /**
-     * The builder of headers' name for the Etcd v3 component.
-     */
-    public static class Etcd3HeaderNameBuilder {
-        /**
-         * The internal instance of the builder used to access to all the
-         * methods representing the name of headers.
-         */
-        private static final Etcd3HeaderNameBuilder INSTANCE = new Etcd3HeaderNameBuilder();
-
-        /**
-         * The action to perform. Supported values: set get delete.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code EtcdAction}.
-         */
-        public String etcdAction() {
-            return "CamelEtcdAction";
-        }
-        /**
-         * The target path.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: common
-         * 
-         * @return the name of the header {@code EtcdPath}.
-         */
-        public String etcdPath() {
-            return "CamelEtcdPath";
-        }
-        /**
-         * To apply an action on all the key-value pairs whose key that starts
-         * with the target path.
-         * 
-         * The option is a: {@code Boolean} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code EtcdIsPrefix}.
-         */
-        public String etcdIsPrefix() {
-            return "CamelEtcdIsPrefix";
-        }
-        /**
-         * The charset to use for the keys.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code EtcdKeyCharset}.
-         */
-        public String etcdKeyCharset() {
-            return "CamelEtcdKeyCharset";
-        }
-        /**
-         * The charset to use for the values.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code EtcdValueCharset}.
-         */
-        public String etcdValueCharset() {
-            return "CamelEtcdValueCharset";
-        }
-    }
-    static Etcd3EndpointBuilder endpointBuilder(String componentName, String path) {
-        class Etcd3EndpointBuilderImpl extends AbstractEndpointBuilder implements Etcd3EndpointBuilder, AdvancedEtcd3EndpointBuilder {
-            public Etcd3EndpointBuilderImpl(String path) {
-                super(componentName, path);
-            }
-        }
-        return new Etcd3EndpointBuilderImpl(path);
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
index 58ce07459ad..3da4c51aa32 100644
--- a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
+++ b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
@@ -110,7 +110,6 @@ org.apache.camel.component.dynamicrouter.routing.DynamicRouterComponent=camel:dy
 org.apache.camel.component.ehcache.EhcacheComponent=camel:ehcache
 org.apache.camel.component.elasticsearch.rest.client.ElasticsearchRestClientComponent=camel:elasticsearch-rest-client
 org.apache.camel.component.es.ElasticsearchComponent=camel:elasticsearch
-org.apache.camel.component.etcd3.Etcd3Component=camel:etcd3
 org.apache.camel.component.event.EventComponent=camel:spring
 org.apache.camel.component.exec.ExecComponent=camel:exec
 org.apache.camel.component.fhir.FhirComponent=camel:fhir
diff --git a/parent/pom.xml b/parent/pom.xml
index f1f635b4766..ab75395a83d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -280,7 +280,6 @@
         <jcip-annotations-version>1.0-1</jcip-annotations-version>
         <jcr-version>2.0</jcr-version>
         <jedis-client-version>5.2.0</jedis-client-version>
-        <jetcd-version>0.8.5</jetcd-version>
         <jetty-version>12.0.17</jetty-version>
         <jetty-for-solr-version>10.0.20</jetty-for-solr-version>
         <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
@@ -1263,11 +1262,6 @@
                 <artifactId>camel-elytron</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-etcd3</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-exec</artifactId>
diff --git a/test-infra/camel-test-infra-all/pom.xml b/test-infra/camel-test-infra-all/pom.xml
index de66d9f50e8..23600e297c3 100644
--- a/test-infra/camel-test-infra-all/pom.xml
+++ b/test-infra/camel-test-infra-all/pom.xml
@@ -196,11 +196,6 @@
             <artifactId>camel-test-infra-jetty</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-etcd3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-opensearch</artifactId>
@@ -454,12 +449,6 @@
                                         <artifactId>camel-test-infra-hashicorp-vault</artifactId>
                                     </dependency>
                                 </fileSet>
-                                <fileSet>
-                                    <dependency>
-                                        <groupId>org.apache.camel</groupId>
-                                        <artifactId>camel-test-infra-etcd3</artifactId>
-                                    </dependency>
-                                </fileSet>
                                 <fileSet>
                                     <dependency>
                                         <groupId>org.apache.camel</groupId>
diff --git a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
index 0069c3ee33c..238afd3de87 100644
--- a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
+++ b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
@@ -259,15 +259,6 @@
   "groupId" : "org.apache.camel",
   "artifactId" : "camel-test-infra-azure-storage-queue",
   "version" : "4.11.0-SNAPSHOT"
-}, {
-  "service" : "org.apache.camel.test.infra.etcd3.services.Etcd3InfraService",
-  "description" : "Key Value store etcd3",
-  "implementation" : "org.apache.camel.test.infra.etcd3.services.Etcd3LocalContainerInfraService",
-  "alias" : [ "etcd3" ],
-  "aliasImplementation" : [ ],
-  "groupId" : "org.apache.camel",
-  "artifactId" : "camel-test-infra-etcd3",
-  "version" : "4.11.0-SNAPSHOT"
 }, {
   "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService",
   "description" : "Embedded SFTP Server",
diff --git a/test-infra/camel-test-infra-etcd3/pom.xml b/test-infra/camel-test-infra-etcd3/pom.xml
deleted file mode 100644
index 6f6376eaca8..00000000000
--- a/test-infra/camel-test-infra-etcd3/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>camel-test-infra-parent</artifactId>
-        <groupId>org.apache.camel</groupId>
-        <relativePath>../camel-test-infra-parent/pom.xml</relativePath>
-        <version>4.11.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>camel-test-infra-etcd3</artifactId>
-    <name>Camel :: Test Infra :: EtcD v3</name>
-    <description>EtcD v3 test infrastructure for Camel</description>
-
-    <properties>
-        <assembly.skipAssembly>false</assembly.skipAssembly>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-common</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <version>${testcontainers-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.etcd</groupId>
-            <artifactId>jetcd-launcher</artifactId>
-            <version>${jetcd-version}</version>
-        </dependency>
-    </dependencies>
-</project>
-
diff --git a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/common/Etcd3Properties.java b/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/common/Etcd3Properties.java
deleted file mode 100644
index e221ab757af..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/common/Etcd3Properties.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.common;
-
-public final class Etcd3Properties {
-    public static final String SERVICE_ADDRESS = "etcd.service.address";
-    public static final String ETCD_CONTAINER = "etcd.container";
-
-    private Etcd3Properties() {
-
-    }
-}
diff --git a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3InfraService.java b/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3InfraService.java
deleted file mode 100644
index 10961ced09a..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3InfraService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.services;
-
-import org.apache.camel.test.infra.common.services.InfrastructureService;
-
-/**
- * Test infra service for EtcD
- */
-public interface Etcd3InfraService extends InfrastructureService {
-
-    String getServiceAddress();
-}
diff --git a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerInfraService.java b/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerInfraService.java
deleted file mode 100644
index f30970fa80a..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerInfraService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.services;
-
-import java.util.List;
-import java.util.UUID;
-
-import io.etcd.jetcd.launcher.EtcdContainer;
-import org.apache.camel.spi.annotations.InfraService;
-import org.apache.camel.test.infra.common.LocalPropertyResolver;
-import org.apache.camel.test.infra.common.services.ContainerService;
-import org.apache.camel.test.infra.etcd3.common.Etcd3Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.wait.strategy.Wait;
-
-@InfraService(service = Etcd3InfraService.class,
-              description = "Key Value store etcd3",
-              serviceAlias = { "etcd3" })
-public class Etcd3LocalContainerInfraService implements Etcd3InfraService, ContainerService<EtcdContainer> {
-    public static final String CONTAINER_NAME = "etcd";
-    public static final int ETCD_CLIENT_PORT = 2379;
-    public static final int ETCD_PEER_PORT = 2380;
-
-    private static final Logger LOG = LoggerFactory.getLogger(Etcd3LocalContainerInfraService.class);
-
-    private final EtcdContainer container;
-
-    public Etcd3LocalContainerInfraService() {
-        this(LocalPropertyResolver.getProperty(
-                Etcd3LocalContainerInfraService.class,
-                Etcd3Properties.ETCD_CONTAINER));
-    }
-
-    public Etcd3LocalContainerInfraService(String imageName) {
-        container = initContainer(imageName, CONTAINER_NAME);
-    }
-
-    public Etcd3LocalContainerInfraService(EtcdContainer container) {
-        this.container = container;
-    }
-
-    public EtcdContainer initContainer(String imageName, String containerName) {
-        return new EtcdContainer(imageName, CONTAINER_NAME, List.of(CONTAINER_NAME))
-                .withNetworkAliases(containerName)
-                .withClusterToken(UUID.randomUUID().toString())
-                .withExposedPorts(ETCD_CLIENT_PORT, ETCD_PEER_PORT)
-                .waitingFor(Wait.forListeningPort())
-                .waitingFor(Wait.forLogMessage(".*ready to serve client requests.*", 1));
-    }
-
-    @Override
-    public void registerProperties() {
-        System.setProperty(Etcd3Properties.SERVICE_ADDRESS, getServiceAddress());
-    }
-
-    @Override
-    public void initialize() {
-        LOG.info("Trying to start the Etcd container");
-        container.start();
-
-        registerProperties();
-        LOG.info("Etcd instance running at {}", getServiceAddress());
-    }
-
-    @Override
-    public void shutdown() {
-        LOG.info("Stopping the Etcd container");
-        container.stop();
-    }
-
-    @Override
-    public EtcdContainer getContainer() {
-        return container;
-    }
-
-    @Override
-    public String getServiceAddress() {
-        return String.format("http://%s:%d", container.getHost(), container.getMappedPort(ETCD_CLIENT_PORT));
-    }
-}
diff --git a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3RemoteInfraService.java b/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3RemoteInfraService.java
deleted file mode 100644
index e32d83c6876..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/main/java/org/apache/camel/test/infra/etcd3/services/Etcd3RemoteInfraService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.services;
-
-import org.apache.camel.test.infra.etcd3.common.Etcd3Properties;
-
-public class Etcd3RemoteInfraService implements Etcd3InfraService {
-
-    @Override
-    public void registerProperties() {
-        // NO-OP
-    }
-
-    @Override
-    public void initialize() {
-        registerProperties();
-    }
-
-    @Override
-    public void shutdown() {
-        // NO-OP
-    }
-
-    @Override
-    public String getServiceAddress() {
-        return System.getProperty(Etcd3Properties.SERVICE_ADDRESS);
-    }
-}
diff --git a/test-infra/camel-test-infra-etcd3/src/main/resources/META-INF/MANIFEST.MF b/test-infra/camel-test-infra-etcd3/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test-infra/camel-test-infra-etcd3/src/main/resources/org/apache/camel/test/infra/etcd3/services/container.properties b/test-infra/camel-test-infra-etcd3/src/main/resources/org/apache/camel/test/infra/etcd3/services/container.properties
deleted file mode 100644
index 353fb3a892a..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/main/resources/org/apache/camel/test/infra/etcd3/services/container.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-etcd.container=gcr.io/etcd-development/etcd:v3.5.14
\ No newline at end of file
diff --git a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3Service.java b/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3Service.java
deleted file mode 100644
index 57b0ee474de..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3Service.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.services;
-
-import org.apache.camel.test.infra.common.services.ContainerTestService;
-import org.apache.camel.test.infra.common.services.TestService;
-
-/**
- * Test infra service for EtcD
- */
-public interface Etcd3Service extends TestService, ContainerTestService, Etcd3InfraService {
-}
diff --git a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3ServiceFactory.java b/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3ServiceFactory.java
deleted file mode 100644
index 4afa28d81b7..00000000000
--- a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3ServiceFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.etcd3.services;
-
-import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
-
-public final class Etcd3ServiceFactory {
-
-    private Etcd3ServiceFactory() {
-
-    }
-
-    public static SimpleTestServiceBuilder<Etcd3Service> builder() {
-        return new SimpleTestServiceBuilder<>("etcd");
-    }
-
-    public static Etcd3Service createService() {
-        return builder()
-                .addLocalMapping(Etcd3LocalContainerTestService::new)
-                .addRemoteMapping(Etcd3RemoteTestService::new)
-                .build();
-    }
-
-    public static class Etcd3LocalContainerTestService extends Etcd3LocalContainerInfraService implements Etcd3Service {
-    }
-
-    public static class Etcd3RemoteTestService extends Etcd3RemoteInfraService implements Etcd3Service {
-    }
-}
diff --git a/test-infra/pom.xml b/test-infra/pom.xml
index 12ddf1e8716..4eefa611389 100644
--- a/test-infra/pom.xml
+++ b/test-infra/pom.xml
@@ -77,7 +77,6 @@
         <module>camel-test-infra-ignite</module>
         <module>camel-test-infra-hashicorp-vault</module>
         <module>camel-test-infra-jetty</module>
-        <module>camel-test-infra-etcd3</module>
         <module>camel-test-infra-core</module>
         <module>camel-test-infra-opensearch</module>
         <module>camel-test-infra-smb</module>