(camel) branch main updated: CAMEL-19971: camel-consul - Migrate to a new project that is maintained

2023-12-21 Thread davsclaus
This is an automated email from the ASF dual-hosted git repository.

davsclaus 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 5bc7f271402 CAMEL-19971: camel-consul - Migrate to a new project that 
is maintained
5bc7f271402 is described below

commit 5bc7f27140258f11bbc5e31892a147ddfb5d6587
Author: Claus Ibsen 
AuthorDate: Fri Dec 22 06:35:34 2023 +0100

CAMEL-19971: camel-consul - Migrate to a new project that is maintained
---
 .../apache/camel/catalog/components/consul.json| 12 ++--
 .../dsl/ConsulComponentBuilderFactory.java | 17 +++---
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 66 ++
 3 files changed, 44 insertions(+), 51 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
index c38a0a352d6..f14cf4e0474 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/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 

(camel) branch main updated: CAMEL-19971: camel-consul - Migrate to a new project that is maintained (#12555)

2023-12-21 Thread davsclaus
This is an automated email from the ASF dual-hosted git repository.

davsclaus 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 9eb3be94c22 CAMEL-19971: camel-consul - Migrate to a new project that 
is maintained (#12555)
9eb3be94c22 is described below

commit 9eb3be94c2270498d474d4aa8666de2a0f4b3fb7
Author: Claus Ibsen 
AuthorDate: Fri Dec 22 06:24:43 2023 +0100

CAMEL-19971: camel-consul - Migrate to a new project that is maintained 
(#12555)
---
 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 @@
 
 
 
-com.orbitz.consul
+org.kiwiproject
 consul-client
 ${consul-client-version}
 
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