You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/21 20:27:56 UTC
(camel) branch consul created (now b545921542c)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch consul
in repository https://gitbox.apache.org/repos/asf/camel.git
at b545921542c CAMEL-19971: camel-consul - Migrate to a new project that is maintained
This branch includes the following new commits:
new b545921542c CAMEL-19971: camel-consul - Migrate to a new project that is maintained
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 01/01: CAMEL-19971: camel-consul - Migrate to a new project that is maintained
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch consul
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b545921542c305d368ff88e8b9dbbf160af87473
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 21 21:27:43 2023 +0100
CAMEL-19971: camel-consul - Migrate to a new project that is maintained
---
components/camel-consul/pom.xml | 2 +-
.../component/consul/ConsulComponentConfigurer.java | 8 ++++----
.../component/consul/ConsulEndpointConfigurer.java | 8 ++++----
.../org/apache/camel/component/consul/consul.json | 12 ++++++------
.../component/consul/ConsulClientConfiguration.java | 4 ++--
.../camel/component/consul/ConsulConfiguration.java | 4 ++--
.../camel/component/consul/ConsulConstants.java | 6 +++---
.../apache/camel/component/consul/ConsulEndpoint.java | 2 +-
.../apache/camel/component/consul/ConsulRegistry.java | 19 +++++++++----------
.../consul/cloud/ConsulServiceDiscovery.java | 10 +++++-----
.../component/consul/cloud/ConsulServiceRegistry.java | 12 ++++++------
.../cloud/ConsulServiceRegistryConfiguration.java | 1 +
.../consul/cluster/ConsulClusterConfiguration.java | 1 +
.../component/consul/cluster/ConsulClusterView.java | 18 +++++++++---------
.../consul/endpoint/AbstractConsulConsumer.java | 2 +-
.../consul/endpoint/AbstractConsulProducer.java | 10 +++++-----
.../consul/endpoint/ConsulAgentProducer.java | 6 +++---
.../consul/endpoint/ConsulCatalogProducer.java | 8 ++++----
.../consul/endpoint/ConsulCoordinatesProducer.java | 4 ++--
.../consul/endpoint/ConsulEventConsumer.java | 12 ++++++------
.../consul/endpoint/ConsulEventProducer.java | 8 ++++----
.../consul/endpoint/ConsulHealthProducer.java | 6 +++---
.../consul/endpoint/ConsulKeyValueConsumer.java | 12 ++++++------
.../consul/endpoint/ConsulKeyValueProducer.java | 8 ++++----
.../consul/endpoint/ConsulPreparedQueryProducer.java | 6 +++---
.../consul/endpoint/ConsulSessionProducer.java | 6 +++---
.../consul/endpoint/ConsulStatusProducer.java | 4 ++--
.../apache/camel/component/consul/ConsulAgentIT.java | 4 ++--
.../camel/component/consul/ConsulCatalogIT.java | 2 +-
.../component/consul/ConsulClientKeyValueIT.java | 2 +-
.../camel/component/consul/ConsulCoordinatesIT.java | 4 ++--
.../apache/camel/component/consul/ConsulEventIT.java | 4 ++--
.../camel/component/consul/ConsulEventWatchIT.java | 2 +-
.../apache/camel/component/consul/ConsulHealthIT.java | 10 +++++-----
.../camel/component/consul/ConsulKeyValueWatchIT.java | 2 +-
.../camel/component/consul/ConsulRegistryIT.java | 2 +-
.../camel/component/consul/ConsulSessionIT.java | 6 +++---
.../camel/component/consul/ConsulTestSupport.java | 2 +-
.../apache/camel/component/consul/MockAgentTest.java | 4 ++--
.../camel/component/consul/MockCatalogTest.java | 4 ++--
.../consul/cloud/ConsulDefaultServiceCallRouteIT.java | 6 +++---
.../consul/cloud/ConsulServiceDiscoveryIT.java | 8 ++++----
.../cloud/ConsulServiceRegistrationTestBase.java | 8 ++++----
.../consul/cloud/ConsulServiceRegistryIT.java | 8 ++++----
.../cloud/SpringConsulServiceCallRouteTest.java | 8 ++++----
.../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 5 +++++
parent/pom.xml | 2 +-
test-infra/camel-test-infra-consul/pom.xml | 2 +-
.../consul/services/ConsulLocalContainerService.java | 2 +-
.../infra/consul/services/ConsulRemoteService.java | 2 +-
.../infra/consul/services/ConsulServiceFactory.java | 2 +-
51 files changed, 153 insertions(+), 147 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 563a005db60..85e28a3e17e 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
- <groupId>com.orbitz.consul</groupId>
+ <groupId>org.kiwiproject</groupId>
<artifactId>consul-client</artifactId>
<version>${consul-client-version}</version>
</dependency>
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
index 0819ebb118d..d4bd5f11b3c 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
@@ -41,9 +41,9 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "connecttimeout":
case "connectTimeout": getOrCreateConfiguration(target).setConnectTimeout(property(camelContext, java.time.Duration.class, value)); return true;
case "consistencymode":
- case "consistencyMode": getOrCreateConfiguration(target).setConsistencyMode(property(camelContext, com.orbitz.consul.option.ConsistencyMode.class, value)); return true;
+ case "consistencyMode": getOrCreateConfiguration(target).setConsistencyMode(property(camelContext, org.kiwiproject.consul.option.ConsistencyMode.class, value)); return true;
case "consulclient":
- case "consulClient": getOrCreateConfiguration(target).setConsulClient(property(camelContext, com.orbitz.consul.Consul.class, value)); return true;
+ case "consulClient": getOrCreateConfiguration(target).setConsulClient(property(camelContext, org.kiwiproject.consul.Consul.class, value)); return true;
case "datacenter": getOrCreateConfiguration(target).setDatacenter(property(camelContext, java.lang.String.class, value)); return true;
case "firstindex":
case "firstIndex": getOrCreateConfiguration(target).setFirstIndex(property(camelContext, java.math.BigInteger.class, value)); return true;
@@ -92,9 +92,9 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "connecttimeout":
case "connectTimeout": return java.time.Duration.class;
case "consistencymode":
- case "consistencyMode": return com.orbitz.consul.option.ConsistencyMode.class;
+ case "consistencyMode": return org.kiwiproject.consul.option.ConsistencyMode.class;
case "consulclient":
- case "consulClient": return com.orbitz.consul.Consul.class;
+ case "consulClient": return org.kiwiproject.consul.Consul.class;
case "datacenter": return java.lang.String.class;
case "firstindex":
case "firstIndex": return java.math.BigInteger.class;
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
index ca6f3e29f30..f0e7708948f 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
@@ -31,9 +31,9 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "connecttimeout":
case "connectTimeout": target.getConfiguration().setConnectTimeout(property(camelContext, java.time.Duration.class, value)); return true;
case "consistencymode":
- case "consistencyMode": target.getConfiguration().setConsistencyMode(property(camelContext, com.orbitz.consul.option.ConsistencyMode.class, value)); return true;
+ case "consistencyMode": target.getConfiguration().setConsistencyMode(property(camelContext, org.kiwiproject.consul.option.ConsistencyMode.class, value)); return true;
case "consulclient":
- case "consulClient": target.getConfiguration().setConsulClient(property(camelContext, com.orbitz.consul.Consul.class, value)); return true;
+ case "consulClient": target.getConfiguration().setConsulClient(property(camelContext, org.kiwiproject.consul.Consul.class, value)); return true;
case "datacenter": target.getConfiguration().setDatacenter(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;
@@ -81,9 +81,9 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "connecttimeout":
case "connectTimeout": return java.time.Duration.class;
case "consistencymode":
- case "consistencyMode": return com.orbitz.consul.option.ConsistencyMode.class;
+ case "consistencyMode": return org.kiwiproject.consul.option.ConsistencyMode.class;
case "consulclient":
- case "consulClient": return com.orbitz.consul.Consul.class;
+ case "consulClient": return org.kiwiproject.consul.Consul.class;
case "datacenter": return java.lang.String.class;
case "exceptionhandler":
case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index c38a0a352d6..f14cf4e0474 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -23,7 +23,7 @@
},
"componentProperties": {
"connectTimeout": { "index": 0, "kind": "property", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "consulClient": { "index": 1, "kind": "property", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
+ "consulClient": { "index": 1, "kind": "property", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.kiwiproject.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a org.kiwiproject.consul.Consul in the registry." },
"key": { "index": 2, "kind": "property", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "index": 3, "kind": "property", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "index": 4, "kind": "property", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
@@ -36,7 +36,7 @@
"valueAsString": { "index": 11, "kind": "property", "displayName": "Value As String", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Default to transform values retrieved from Consul i.e. on KV endpoint to string." },
"autowiredEnabled": { "index": 12, "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 [...]
"configuration": { "index": 13, "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.consul.ConsulConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Consul configuration" },
- "consistencyMode": { "index": 14, "kind": "property", "displayName": "Consistency Mode", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.orbitz.consul.option.ConsistencyMode", "enum": [ "DEFAULT", "STALE", "CONSISTENT" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DEFAULT", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": [...]
+ "consistencyMode": { "index": 14, "kind": "property", "displayName": "Consistency Mode", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.kiwiproject.consul.option.ConsistencyMode", "enum": [ "DEFAULT", "STALE", "CONSISTENT" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DEFAULT", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "descripti [...]
"datacenter": { "index": 15, "kind": "property", "displayName": "Datacenter", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The data center" },
"nearNode": { "index": 16, "kind": "property", "displayName": "Near Node", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The near node to use for queries." },
"nodeMeta": { "index": 17, "kind": "property", "displayName": "Node Meta", "group": "advanced", "label": "advanced", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The note meta-data to use for queries." },
@@ -76,16 +76,16 @@
"CamelConsulNodeMeta": { "index": 23, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "List<String>", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The note meta-data to use for queries.", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_NODE_META" },
"CamelConsulLastContact": { "index": 24, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The last contact", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_LAST_CONTACT" },
"CamelConsulKnownLeader": { "index": 25, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Indicates whether it is the known leader", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_KNOWN_LEADER" },
- "CamelConsulConsistencyMode": { "index": 26, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "com.orbitz.consul.option.ConsistencyMode", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "DEFAULT", "description": "The consistencyMode used for queries", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_CONSISTENCY_MODE" },
+ "CamelConsulConsistencyMode": { "index": 26, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.kiwiproject.consul.option.ConsistencyMode", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "DEFAULT", "description": "The consistencyMode used for queries", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_CONSISTENCY_MODE" },
"CamelConsulHealthyOnly": { "index": 27, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "Only on healthy services", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_HEALTHY_ONLY" },
- "CamelConsulHealthyState": { "index": 28, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "com.orbitz.consul.model.State", "enum": [ "PASS", "WARN", "FAIL", "ANY", "UNKNOWN" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The state to query.", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_HEALTHY_STATE" },
+ "CamelConsulHealthyState": { "index": 28, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.kiwiproject.consul.model.State", "enum": [ "PASS", "WARN", "FAIL", "ANY", "UNKNOWN" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The state to query.", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_HEALTHY_STATE" },
"CamelConsulPreparedQueryID": { "index": 29, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the prepared query", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_PREPARED_QUERY_ID" },
"CamelConsulServiceId": { "index": 30, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The service id for agent deregistration", "constantName": "org.apache.camel.component.consul.ConsulConstants#CONSUL_SERVICE_ID" }
},
"properties": {
"apiEndpoint": { "index": 0, "kind": "path", "displayName": "Api Endpoint", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The API endpoint" },
"connectTimeout": { "index": 1, "kind": "parameter", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "consulClient": { "index": 2, "kind": "parameter", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
+ "consulClient": { "index": 2, "kind": "parameter", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.kiwiproject.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a org.kiwiproject.consul.Consul in the registry." },
"key": { "index": 3, "kind": "parameter", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "index": 4, "kind": "parameter", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "index": 5, "kind": "parameter", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
@@ -98,7 +98,7 @@
"action": { "index": 12, "kind": "parameter", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default action. Can be overridden by CamelConsulAction" },
"valueAsString": { "index": 13, "kind": "parameter", "displayName": "Value As String", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Default to transform values retrieved from Consul i.e. on KV endpoint to string." },
"lazyStartProducer": { "index": 14, "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 [...]
- "consistencyMode": { "index": 15, "kind": "parameter", "displayName": "Consistency Mode", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.orbitz.consul.option.ConsistencyMode", "enum": [ "DEFAULT", "STALE", "CONSISTENT" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DEFAULT", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": [...]
+ "consistencyMode": { "index": 15, "kind": "parameter", "displayName": "Consistency Mode", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.kiwiproject.consul.option.ConsistencyMode", "enum": [ "DEFAULT", "STALE", "CONSISTENT" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DEFAULT", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "descript [...]
"datacenter": { "index": 16, "kind": "parameter", "displayName": "Datacenter", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The data center" },
"nearNode": { "index": 17, "kind": "parameter", "displayName": "Near Node", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The near node to use for queries." },
"nodeMeta": { "index": 18, "kind": "parameter", "displayName": "Node Meta", "group": "advanced", "label": "advanced", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The note meta-data to use for queries." },
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
index 7151e89df53..ff917beafe8 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
@@ -25,14 +25,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.option.ConsistencyMode;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.option.ConsistencyMode;
@UriParams
public abstract class ConsulClientConfiguration implements Cloneable {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java
index 359e90e54e8..117960efc8f 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.consul;
-import com.orbitz.consul.Consul;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
+import org.kiwiproject.consul.Consul;
@UriParams
public class ConsulConfiguration extends ConsulClientConfiguration {
@@ -73,7 +73,7 @@ public class ConsulConfiguration extends ConsulClientConfiguration {
}
/**
- * Reference to a `com.orbitz.consul.Consul` in the registry.
+ * Reference to a `org.kiwiproject.consul.Consul` in the registry.
*/
public void setConsulClient(Consul consulClient) {
this.consulClient = consulClient;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConstants.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConstants.java
index 9d7f565df79..06beb8b9bcb 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConstants.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConstants.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.consul;
-import com.orbitz.consul.Consul;
import org.apache.camel.spi.Metadata;
+import org.kiwiproject.consul.Consul;
public interface ConsulConstants {
String CONSUL_DEFAULT_URL = String.format("http://%s:%d", Consul.DEFAULT_HTTP_HOST, Consul.DEFAULT_HTTP_PORT);
@@ -82,11 +82,11 @@ public interface ConsulConstants {
@Metadata(label = "producer", description = "Indicates whether it is the known leader", javaType = "Boolean")
String CONSUL_KNOWN_LEADER = "CamelConsulKnownLeader";
@Metadata(label = "producer", description = "The consistencyMode used for queries",
- javaType = "com.orbitz.consul.option.ConsistencyMode", defaultValue = "DEFAULT")
+ javaType = "org.kiwiproject.consul.option.ConsistencyMode", defaultValue = "DEFAULT")
String CONSUL_CONSISTENCY_MODE = "CamelConsulConsistencyMode";
@Metadata(label = "producer", description = "Only on healthy services", javaType = "Boolean", defaultValue = "false")
String CONSUL_HEALTHY_ONLY = "CamelConsulHealthyOnly";
- @Metadata(label = "producer", description = "The state to query.", javaType = "com.orbitz.consul.model.State")
+ @Metadata(label = "producer", description = "The state to query.", javaType = "org.kiwiproject.consul.model.State")
String CONSUL_HEALTHY_STATE = "CamelConsulHealthyState";
@Metadata(label = "producer", description = "The id of the prepared query", javaType = "String")
String CONSUL_PREPARED_QUERY_ID = "CamelConsulPreparedQueryID";
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
index dce77df4c52..a9065af8c9f 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.consul;
import java.util.Optional;
-import com.orbitz.consul.Consul;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -29,6 +28,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
/**
* Integrate with <a href="https://www.consul.io/">Consul</a> service discovery and configuration store.
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulRegistry.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulRegistry.java
index 0239f3455d4..fa827cac44d 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulRegistry.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulRegistry.java
@@ -32,15 +32,15 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Supplier;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.ConsulException;
-import com.orbitz.consul.KeyValueClient;
-import com.orbitz.consul.SessionClient;
-import com.orbitz.consul.model.session.ImmutableSession;
-import com.orbitz.consul.model.session.SessionCreatedResponse;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Registry;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.ConsulException;
+import org.kiwiproject.consul.KeyValueClient;
+import org.kiwiproject.consul.SessionClient;
+import org.kiwiproject.consul.model.session.ImmutableSession;
+import org.kiwiproject.consul.model.session.SessionCreatedResponse;
/**
* Apache Camel Plug-in for Consul Registry (Objects stored under kv/key as well as bookmarked under kv/[type]/key to
@@ -173,7 +173,7 @@ public class ConsulRegistry implements Registry {
public void remove(String key) {
// create session to avoid conflicts (not sure if that is safe enough)
SessionClient sessionClient = consul.sessionClient();
- String sessionName = "session_" + UUID.randomUUID().toString();
+ String sessionName = "session_" + UUID.randomUUID();
SessionCreatedResponse response = sessionClient.createSession(ImmutableSession.builder().name(sessionName).build());
String sessionId = response.getId();
@@ -196,7 +196,7 @@ public class ConsulRegistry implements Registry {
// create session to avoid conflicts
// (not sure if that is safe enough, again)
SessionClient sessionClient = consul.sessionClient();
- String sessionName = "session_" + UUID.randomUUID().toString();
+ String sessionName = "session_" + UUID.randomUUID();
SessionCreatedResponse response = sessionClient.createSession(ImmutableSession.builder().name(sessionName).build());
String sessionId = response.getId();
kvClient = consul.keyValueClient();
@@ -308,8 +308,7 @@ public class ConsulRegistry implements Registry {
/**
* Serializes the given {@code serializable} using Java Serialization
*
- * @param serializable
- * @return the serialized object as a byte array
+ * @return the serialized object as a byte array
*/
static byte[] serialize(Serializable serializable) {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
index 1df61585534..abf9735e345 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
@@ -22,11 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.catalog.CatalogService;
-import com.orbitz.consul.model.health.ServiceHealth;
-import com.orbitz.consul.option.ImmutableQueryOptions;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.consul.ConsulConfiguration;
@@ -35,6 +30,11 @@ import org.apache.camel.impl.cloud.DefaultServiceDiscovery;
import org.apache.camel.impl.cloud.DefaultServiceHealth;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.function.Suppliers;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.catalog.CatalogService;
+import org.kiwiproject.consul.model.health.ServiceHealth;
+import org.kiwiproject.consul.option.ImmutableQueryOptions;
+import org.kiwiproject.consul.option.QueryOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
index 1f939ce4920..fc4c56082ad 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
@@ -24,16 +24,16 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.NotRegisteredException;
-import com.orbitz.consul.model.agent.ImmutableRegCheck;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Registration;
-import com.orbitz.consul.model.health.Service;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.impl.cloud.AbstractServiceRegistry;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.NotRegisteredException;
+import org.kiwiproject.consul.model.agent.ImmutableRegCheck;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.agent.Registration;
+import org.kiwiproject.consul.model.health.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryConfiguration.java
index 146dc50f1fa..38a63bb90df 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryConfiguration.java
@@ -20,6 +20,7 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.consul.ConsulClientConfiguration;
public class ConsulServiceRegistryConfiguration extends ConsulClientConfiguration {
+
/**
* Should we remove all the registered services know by this registry on stop?
*/
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
index 0261dbb609b..253d584982d 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
@@ -20,6 +20,7 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.consul.ConsulClientConfiguration;
public class ConsulClusterConfiguration extends ConsulClientConfiguration {
+
private int sessionTtl = 60;
private int sessionLockDelay = 5;
private int sessionRefreshInterval = 5;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
index 39261658af9..a4688bbf6e1 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
@@ -24,18 +24,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.KeyValueClient;
-import com.orbitz.consul.SessionClient;
-import com.orbitz.consul.async.ConsulResponseCallback;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.model.kv.Value;
-import com.orbitz.consul.model.session.ImmutableSession;
-import com.orbitz.consul.model.session.SessionInfo;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.cluster.CamelClusterMember;
import org.apache.camel.support.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.KeyValueClient;
+import org.kiwiproject.consul.SessionClient;
+import org.kiwiproject.consul.async.ConsulResponseCallback;
+import org.kiwiproject.consul.model.ConsulResponse;
+import org.kiwiproject.consul.model.kv.Value;
+import org.kiwiproject.consul.model.session.ImmutableSession;
+import org.kiwiproject.consul.model.session.SessionInfo;
+import org.kiwiproject.consul.option.QueryOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulConsumer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulConsumer.java
index 2ceb2734121..c5429d725b2 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulConsumer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulConsumer.java
@@ -20,13 +20,13 @@ import java.math.BigInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
-import com.orbitz.consul.Consul;
import org.apache.camel.Processor;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
abstract class AbstractConsulConsumer<C> extends DefaultConsumer {
protected final ConsulEndpoint endpoint;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulProducer.java
index 4adf514f57f..30c6b9cfb51 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/AbstractConsulProducer.java
@@ -20,11 +20,6 @@ import java.math.BigInteger;
import java.util.List;
import java.util.function.Function;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.option.ConsistencyMode;
-import com.orbitz.consul.option.ImmutableQueryOptions;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.Message;
import org.apache.camel.NoSuchHeaderException;
import org.apache.camel.Processor;
@@ -33,6 +28,11 @@ import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.support.HeaderSelectorProducer;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.ConsulResponse;
+import org.kiwiproject.consul.option.ConsistencyMode;
+import org.kiwiproject.consul.option.ImmutableQueryOptions;
+import org.kiwiproject.consul.option.QueryOptions;
abstract class AbstractConsulProducer<C> extends HeaderSelectorProducer {
private final ConsulEndpoint endpoint;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulAgentProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulAgentProducer.java
index d2fa52bf620..e9e1ead1fc1 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulAgentProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulAgentProducer.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.AgentClient;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.AgentClient;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.agent.Registration;
public final class ConsulAgentProducer extends AbstractConsulProducer<AgentClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
index 2d145ab3dc2..7278f8ff6e4 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.CatalogClient;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.catalog.CatalogDeregistration;
-import com.orbitz.consul.model.catalog.CatalogRegistration;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.CatalogClient;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.catalog.CatalogDeregistration;
+import org.kiwiproject.consul.model.catalog.CatalogRegistration;
public final class ConsulCatalogProducer extends AbstractConsulProducer<CatalogClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
index c901f8e429f..f256fa4f83a 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.CoordinateClient;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.CoordinateClient;
public final class ConsulCoordinatesProducer extends AbstractConsulProducer<CoordinateClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventConsumer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventConsumer.java
index d28b64311be..45e8c1b2cc0 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventConsumer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventConsumer.java
@@ -21,12 +21,6 @@ import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.EventClient;
-import com.orbitz.consul.async.EventResponseCallback;
-import com.orbitz.consul.model.EventResponse;
-import com.orbitz.consul.model.event.Event;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -34,6 +28,12 @@ import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.ExecutorServiceManager;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.EventClient;
+import org.kiwiproject.consul.async.EventResponseCallback;
+import org.kiwiproject.consul.model.EventResponse;
+import org.kiwiproject.consul.model.event.Event;
+import org.kiwiproject.consul.option.QueryOptions;
import org.slf4j.LoggerFactory;
public final class ConsulEventConsumer extends AbstractConsulConsumer<EventClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
index cf514f2d122..472626f2294 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.EventClient;
-import com.orbitz.consul.option.EventOptions;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.EventClient;
+import org.kiwiproject.consul.option.EventOptions;
+import org.kiwiproject.consul.option.QueryOptions;
public final class ConsulEventProducer extends AbstractConsulProducer<EventClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
index 643c4a82a0f..4b05d46afaa 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.State;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.HealthClient;
+import org.kiwiproject.consul.model.State;
public final class ConsulHealthProducer extends AbstractConsulProducer<HealthClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueConsumer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueConsumer.java
index e3adb3a2555..bcff5c9f52e 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueConsumer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueConsumer.java
@@ -19,18 +19,18 @@ package org.apache.camel.component.consul.endpoint;
import java.util.List;
import java.util.Optional;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.KeyValueClient;
-import com.orbitz.consul.async.ConsulResponseCallback;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.model.kv.Value;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.KeyValueClient;
+import org.kiwiproject.consul.async.ConsulResponseCallback;
+import org.kiwiproject.consul.model.ConsulResponse;
+import org.kiwiproject.consul.model.kv.Value;
+import org.kiwiproject.consul.option.QueryOptions;
public final class ConsulKeyValueConsumer extends AbstractConsulConsumer<KeyValueClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
index 74a611386f0..69626d430fb 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.KeyValueClient;
-import com.orbitz.consul.option.PutOptions;
-import com.orbitz.consul.option.QueryOptions;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.KeyValueClient;
+import org.kiwiproject.consul.option.PutOptions;
+import org.kiwiproject.consul.option.QueryOptions;
public final class ConsulKeyValueProducer extends AbstractConsulProducer<KeyValueClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
index b19fbca22a0..14422a03913 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.PreparedQueryClient;
-import com.orbitz.consul.model.query.PreparedQuery;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.PreparedQueryClient;
+import org.kiwiproject.consul.model.query.PreparedQuery;
public final class ConsulPreparedQueryProducer extends AbstractConsulProducer<PreparedQueryClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
index 0ab57e69a69..9f22f7ad4a1 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.SessionClient;
-import com.orbitz.consul.model.session.Session;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.SessionClient;
+import org.kiwiproject.consul.model.session.Session;
public final class ConsulSessionProducer extends AbstractConsulProducer<SessionClient> {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulStatusProducer.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulStatusProducer.java
index 6e13f3ad803..c8adf154957 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulStatusProducer.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulStatusProducer.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.consul.endpoint;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.StatusClient;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulEndpoint;
import org.apache.camel.spi.InvokeOnHeader;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.StatusClient;
public final class ConsulStatusProducer extends AbstractConsulProducer<StatusClient> {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulAgentIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulAgentIT.java
index c33a65a409c..2ecc9d1940e 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulAgentIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulAgentIT.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.consul;
import java.util.Map;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.health.Service;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulAgentActions;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.health.Service;
public class ConsulAgentIT extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogIT.java
index a867f1b9cb1..9dbfac93d83 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogIT.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.consul;
import java.util.List;
import java.util.Map;
-import com.orbitz.consul.model.health.Node;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCatalogActions;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.health.Node;
public class ConsulCatalogIT extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueIT.java
index 5cbf4894671..66c8046c8f8 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueIT.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.consul;
import java.util.Optional;
-import com.orbitz.consul.Consul;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.Consul;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesIT.java
index 175da486a6c..812dea17341 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesIT.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.consul;
import java.util.List;
-import com.orbitz.consul.model.coordinate.Coordinate;
-import com.orbitz.consul.model.coordinate.Datacenter;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCoordinatesActions;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.coordinate.Coordinate;
+import org.kiwiproject.consul.model.coordinate.Datacenter;
public class ConsulCoordinatesIT extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventIT.java
index 0ac146476a7..45cc54aa97c 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventIT.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.consul;
import java.util.List;
-import com.orbitz.consul.model.EventResponse;
-import com.orbitz.consul.model.event.Event;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulEventActions;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.EventResponse;
+import org.kiwiproject.consul.model.event.Event;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchIT.java
index 2f2edfd09e3..b9400a92505 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchIT.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.consul;
import java.util.List;
-import com.orbitz.consul.EventClient;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.EventClient;
public class ConsulEventWatchIT extends ConsulTestSupport {
private String key;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java
index f12ee40b7e7..1aecc6a63c8 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java
@@ -21,11 +21,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import com.orbitz.consul.AgentClient;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Registration;
-import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulHealthActions;
@@ -34,6 +29,11 @@ import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.AgentClient;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.agent.Registration;
+import org.kiwiproject.consul.model.health.ServiceHealth;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchIT.java
index f43c5947413..caa2e462c03 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchIT.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.consul;
import java.security.SecureRandom;
import java.util.List;
-import com.orbitz.consul.KeyValueClient;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.KeyValueClient;
public class ConsulKeyValueWatchIT extends ConsulTestSupport {
private String key;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java
index f6a73329c24..c08687709df 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java
@@ -22,13 +22,13 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import com.orbitz.consul.Consul;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.test.infra.consul.services.ConsulService;
import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.kiwiproject.consul.Consul;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionIT.java
index f4ab58efca2..d66b840a4bc 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionIT.java
@@ -19,13 +19,13 @@ package org.apache.camel.component.consul;
import java.util.List;
import java.util.UUID;
-import com.orbitz.consul.model.session.ImmutableSession;
-import com.orbitz.consul.model.session.SessionCreatedResponse;
-import com.orbitz.consul.model.session.SessionInfo;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulSessionActions;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.session.ImmutableSession;
+import org.kiwiproject.consul.model.session.SessionCreatedResponse;
+import org.kiwiproject.consul.model.session.SessionInfo;
public class ConsulSessionIT extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index 3de233b4c11..137412f9d0f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -20,12 +20,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import com.orbitz.consul.Consul;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.infra.consul.services.ConsulService;
import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.kiwiproject.consul.Consul;
public class ConsulTestSupport extends CamelTestSupport {
@RegisterExtension
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
index bebf4bd78c6..720ee0e3cb7 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.consul;
import java.util.Map;
-import com.orbitz.consul.model.health.ImmutableService;
-import com.orbitz.consul.model.health.Service;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.RouteBuilder;
@@ -28,6 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.health.ImmutableService;
+import org.kiwiproject.consul.model.health.Service;
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
import static org.apache.camel.builder.Builder.constant;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java
index 7a7a10c1ff8..d67046f5053 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.consul;
import java.util.List;
-import com.orbitz.consul.model.health.ImmutableNode;
-import com.orbitz.consul.model.health.Node;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.RouteBuilder;
@@ -28,6 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.model.health.ImmutableNode;
+import org.kiwiproject.consul.model.health.Node;
import static java.util.Collections.singletonList;
import static org.apache.camel.builder.Builder.constant;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
index 1ca04e841cc..a482939878c 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
@@ -19,15 +19,15 @@ package org.apache.camel.component.consul.cloud;
import java.util.ArrayList;
import java.util.List;
-import com.orbitz.consul.AgentClient;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.AgentClient;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.agent.Registration;
public class ConsulDefaultServiceCallRouteIT extends ConsulTestSupport {
private static final String SERVICE_NAME = "http-service";
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
index 737b862f278..62cd52bcb15 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
@@ -20,10 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
-import com.orbitz.consul.AgentClient;
-import com.orbitz.consul.model.agent.ImmutableRegCheck;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.component.consul.ConsulConfiguration;
@@ -31,6 +27,10 @@ import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.AgentClient;
+import org.kiwiproject.consul.model.agent.ImmutableRegCheck;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.agent.Registration;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
index f9a6189d585..2a2e34a4b34 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
@@ -21,15 +21,15 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import com.orbitz.consul.CatalogClient;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.catalog.CatalogService;
-import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.CatalogClient;
+import org.kiwiproject.consul.HealthClient;
+import org.kiwiproject.consul.model.catalog.CatalogService;
+import org.kiwiproject.consul.model.health.ServiceHealth;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryIT.java
index c2bbcfaab4d..9575bbc22f0 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryIT.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.consul.cloud;
import java.util.List;
-import com.orbitz.consul.CatalogClient;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.catalog.CatalogService;
-import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
import org.junit.jupiter.api.Test;
+import org.kiwiproject.consul.CatalogClient;
+import org.kiwiproject.consul.HealthClient;
+import org.kiwiproject.consul.model.catalog.CatalogService;
+import org.kiwiproject.consul.model.health.ServiceHealth;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
index 3698e94e08f..6958d43a1c8 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
@@ -20,10 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import com.orbitz.consul.AgentClient;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Route;
@@ -37,6 +33,10 @@ import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.kiwiproject.consul.AgentClient;
+import org.kiwiproject.consul.Consul;
+import org.kiwiproject.consul.model.agent.ImmutableRegistration;
+import org.kiwiproject.consul.model.agent.Registration;
public abstract class SpringConsulServiceCallRouteTest extends CamelSpringTestSupport {
@RegisterExtension
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
index 5dcb1b63361..b409492c8f9 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
@@ -79,6 +79,11 @@ With the AZURE_IDENTITY mode the user will be able to use the Default Azure Cred
With the SHARED_ACCOUNT_KEY mode the user could explicitly set the accessKey parameter.
This is part of the effort explained in CAMEL-18590.
+=== camel-consul
+
+This component has migrated from `com.orbitz.consul:consul-client` to `org.kiwiproject:consul-client` as the former is no longer maintained,
+and kiwiproject took over.
+
=== camel-hdfs
The component has been removed after deprecation in 4.3.0
diff --git a/parent/pom.xml b/parent/pom.xml
index 3beaafb24d4..12ac063aa15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -110,7 +110,7 @@
<commons-text-version>1.11.0</commons-text-version>
<commons-validator-version>1.8.0</commons-validator-version>
<compress-lzf-version>1.1.2</compress-lzf-version>
- <consul-client-version>1.5.3</consul-client-version>
+ <consul-client-version>1.2.0</consul-client-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<couchbase-client-version>3.5.1</couchbase-client-version>
<curator-version>5.5.0</curator-version>
diff --git a/test-infra/camel-test-infra-consul/pom.xml b/test-infra/camel-test-infra-consul/pom.xml
index b00f91123b9..9d88a1af16c 100644
--- a/test-infra/camel-test-infra-consul/pom.xml
+++ b/test-infra/camel-test-infra-consul/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
- <groupId>com.orbitz.consul</groupId>
+ <groupId>org.kiwiproject</groupId>
<artifactId>consul-client</artifactId>
<version>${consul-client-version}</version>
</dependency>
diff --git a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulLocalContainerService.java b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulLocalContainerService.java
index 668419dcbe0..4ef8c2aed24 100644
--- a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulLocalContainerService.java
+++ b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulLocalContainerService.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.test.infra.consul.services;
-import com.orbitz.consul.Consul;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.consul.common.ConsulProperties;
+import org.kiwiproject.consul.Consul;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
diff --git a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulRemoteService.java b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulRemoteService.java
index 0a36970de13..f249453848e 100644
--- a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulRemoteService.java
+++ b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulRemoteService.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.test.infra.consul.services;
-import com.orbitz.consul.Consul;
import org.apache.camel.test.infra.consul.common.ConsulProperties;
+import org.kiwiproject.consul.Consul;
public class ConsulRemoteService implements ConsulService {
diff --git a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java
index f47126a76c7..ea1a08f72f8 100644
--- a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java
+++ b/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java
@@ -19,8 +19,8 @@ package org.apache.camel.test.infra.consul.services;
import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
public final class ConsulServiceFactory {
- private ConsulServiceFactory() {
+ private ConsulServiceFactory() {
}
public static SimpleTestServiceBuilder<ConsulService> builder() {