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 a3ea367f796 camel-cloud - Deprecated
a3ea367f796 is described below
commit a3ea367f7966c36afb7244dd201f42af7ca6a01c
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Dec 11 21:17:30 2024 +0100
camel-cloud - Deprecated
---
.../generated/resources/org/apache/camel/catalog/others/cloud.json | 4 ++--
.../apache/camel/component/consul/cloud/ConsulServiceDiscovery.java | 1 +
.../camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java | 1 +
.../apache/camel/component/consul/cloud/ConsulServiceRegistry.java | 1 +
.../component/consul/cloud/ConsulServiceRegistryConfiguration.java | 1 +
.../org/apache/camel/component/dns/cloud/DnsServiceDiscovery.java | 1 +
.../apache/camel/component/dns/cloud/DnsServiceDiscoveryFactory.java | 1 +
.../apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java | 1 +
.../camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java | 1 +
.../apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java | 1 +
.../org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java | 1 +
.../camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java | 1 +
.../camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java | 1 +
.../org/apache/camel/component/http/cloud/HttpServiceExpression.java | 1 +
.../camel/component/http/cloud/HttpServiceExpressionFactory.java | 1 +
.../component/kubernetes/cloud/KubernetesClientServiceDiscovery.java | 1 +
.../component/kubernetes/cloud/KubernetesDnsServiceDiscovery.java | 1 +
.../component/kubernetes/cloud/KubernetesDnsSrvServiceDiscovery.java | 1 +
.../component/kubernetes/cloud/KubernetesEnvServiceDiscovery.java | 1 +
.../camel/component/kubernetes/cloud/KubernetesServiceDiscovery.java | 1 +
.../component/kubernetes/cloud/KubernetesServiceDiscoveryFactory.java | 1 +
.../camel/component/netty/http/cloud/NettyHttpServiceExpression.java | 1 +
.../component/netty/http/cloud/NettyHttpServiceExpressionFactory.java | 1 +
.../camel/component/undertow/cloud/UndertowServiceExpression.java | 1 +
.../component/undertow/cloud/UndertowServiceExpressionFactory.java | 1 +
.../java/org/apache/camel/component/zookeeper/cloud/MetaData.java | 1 +
.../camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java | 1 +
.../component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java | 1 +
.../camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java | 1 +
.../zookeeper/cloud/ZooKeeperServiceRegistryConfiguration.java | 1 +
.../java/org/apache/camel/spi/annotations/CloudServiceFactory.java | 1 +
core/camel-cloud/pom.xml | 4 ++--
.../resources/META-INF/services/org/apache/camel/other.properties | 4 ++--
core/camel-cloud/src/generated/resources/cloud.json | 4 ++--
.../java/org/apache/camel/spi/annotations/CloudServiceFactory.java | 1 +
35 files changed, 39 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
index 8e2bb16c957..ab52fd7530a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
@@ -3,8 +3,8 @@
"kind": "other",
"name": "cloud",
"title": "Cloud",
- "description": "Camel Cloud support (deprecated since 4.7)",
- "deprecated": false,
+ "description": "Camel Cloud support",
+ "deprecated": true,
"firstVersion": "3.0",
"label": "core,cloud",
"supportLevel": "Stable",
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 abf9735e345..6cc5e57d8ed 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
@@ -38,6 +38,7 @@ import org.kiwiproject.consul.option.QueryOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public final class ConsulServiceDiscovery extends DefaultServiceDiscovery {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConsulServiceDiscovery.class);
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
index 3360c86c496..e370d33e6d8 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
@@ -28,6 +28,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
@CloudServiceFactory("consul-service-discovery")
@Configurer
+@Deprecated
public class ConsulServiceDiscoveryFactory implements ServiceDiscoveryFactory {
private final ConsulConfiguration configuration;
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 fc4c56082ad..6ac810b03e5 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
@@ -37,6 +37,7 @@ import org.kiwiproject.consul.model.health.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ConsulServiceRegistry extends AbstractServiceRegistry {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConsulServiceRegistry.class);
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 38a63bb90df..21155f272f0 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.consul.cloud;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.consul.ConsulClientConfiguration;
+@Deprecated
public class ConsulServiceRegistryConfiguration extends
ConsulClientConfiguration {
/**
diff --git
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscovery.java
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscovery.java
index 022bfe4e2a3..df5186798dd 100644
---
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscovery.java
+++
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscovery.java
@@ -38,6 +38,7 @@ import org.xbill.DNS.SRVRecord;
import org.xbill.DNS.TextParseException;
import org.xbill.DNS.Type;
+@Deprecated
public final class DnsServiceDiscovery extends DefaultServiceDiscovery {
private static final Comparator<SRVRecord> COMPARATOR = comparator();
private final DnsConfiguration configuration;
diff --git
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryFactory.java
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryFactory.java
index 1ad23484e43..4980b03a1da 100644
---
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryFactory.java
+++
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryFactory.java
@@ -25,6 +25,7 @@ import org.apache.camel.spi.annotations.CloudServiceFactory;
@CloudServiceFactory("dns-service-discovery")
@Configurer
+@Deprecated
public class DnsServiceDiscoveryFactory implements ServiceDiscoveryFactory {
private final DnsConfiguration configuration;
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
index 8b511cc60bb..949a4ef38bd 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3GetServicesResponse.java
@@ -23,6 +23,7 @@ import org.apache.camel.cloud.ServiceDefinition;
/**
* A plain Java object representing the list of services that could be found
at a specific revision.
*/
+@Deprecated
final class Etcd3GetServicesResponse {
/**
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
index 2e5353a4058..dd50bf8879d 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3OnDemandServiceDiscovery.java
@@ -24,6 +24,7 @@ import org.apache.camel.component.etcd3.Etcd3Configuration;
/**
* An implementation of a {@link Etcd3ServiceDiscovery} that retrieves the
service definitions from etcd at each call.
*/
+@Deprecated
public class Etcd3OnDemandServiceDiscovery extends Etcd3ServiceDiscovery {
public Etcd3OnDemandServiceDiscovery(Etcd3Configuration configuration) {
super(configuration);
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
index 24cace9536e..775d6ccc7fe 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDefinition.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
+@Deprecated
public class Etcd3ServiceDefinition extends DefaultServiceDefinition {
public static final Comparator<Etcd3ServiceDefinition> COMPARATOR =
Comparator.comparing(Etcd3ServiceDefinition::getHost)
.thenComparingInt(Etcd3ServiceDefinition::getPort);
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
index 020504dbc60..2eec3020b79 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscovery.java
@@ -44,6 +44,7 @@ import static
org.apache.camel.component.etcd3.Etcd3Helper.toPathPrefix;
/**
* The root implementation of {@code ServiceDiscovery} fetching the data from
etcd.
*/
+@Deprecated
abstract class Etcd3ServiceDiscovery extends DefaultServiceDiscovery {
/**
* The logger.
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
index 8f1c6a49e67..2e784424181 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3ServiceDiscoveryFactory.java
@@ -30,6 +30,7 @@ import org.apache.camel.util.ObjectHelper;
@CloudServiceFactory("etcd-service-discovery")
@Configurer
+@Deprecated
public class Etcd3ServiceDiscoveryFactory implements ServiceDiscoveryFactory {
/**
* The configuration of the factory.
diff --git
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
index ee1bf2e89a6..4576ab6afa0 100644
---
a/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
+++
b/components/camel-etcd3/src/main/java/org/apache/camel/component/etcd3/cloud/Etcd3WatchServiceDiscovery.java
@@ -39,6 +39,7 @@ import static
org.apache.camel.component.etcd3.Etcd3Helper.toPathPrefix;
* An implementation of a {@link Etcd3ServiceDiscovery} that retrieves all the
service definitions from etcd at first
* call, then refresh the list when a change has been detected.
*/
+@Deprecated
public class Etcd3WatchServiceDiscovery extends Etcd3ServiceDiscovery
implements Watch.Listener {
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
index 97efec92247..0e7511d634f 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
@@ -21,6 +21,7 @@ import
org.apache.camel.impl.cloud.DefaultServiceCallExpression;
/**
* The default is based on camel-http, this class is added to allow further
customizations.
*/
+@Deprecated
public final class HttpServiceExpression extends DefaultServiceCallExpression {
public HttpServiceExpression() {
}
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
index 25f21d21de2..00d3a217d02 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.spi.annotations.CloudServiceFactory;
@CloudServiceFactory("http-service-expression,https-service-expression")
@Configurer
+@Deprecated
public class HttpServiceExpressionFactory implements ServiceExpressionFactory {
@Override
public Expression newInstance(CamelContext camelContext) throws Exception {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
index 3d51d4ba826..6d853ac2aa7 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
@@ -34,6 +34,7 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class KubernetesClientServiceDiscovery extends
KubernetesServiceDiscovery {
private static final Logger LOG =
LoggerFactory.getLogger(KubernetesClientServiceDiscovery.class);
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsServiceDiscovery.java
index 752dc40aa35..e2e5f965244 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsServiceDiscovery.java
@@ -26,6 +26,7 @@ import
org.apache.camel.component.kubernetes.KubernetesConfiguration;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
import org.apache.camel.util.ObjectHelper;
+@Deprecated
public class KubernetesDnsServiceDiscovery extends KubernetesServiceDiscovery {
private final ConcurrentMap<String, List<ServiceDefinition>> cache;
private final String namespace;
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsSrvServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsSrvServiceDiscovery.java
index a4c203e9442..c3f1a54f487 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsSrvServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesDnsSrvServiceDiscovery.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
/**
* Discovers where services are running on which servers in Kubernetes.
*/
+@Deprecated
public class KubernetesDnsSrvServiceDiscovery extends
KubernetesServiceDiscovery {
private static final Logger LOGGER;
private static final String[] ATTRIBUTE_IDS;
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesEnvServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesEnvServiceDiscovery.java
index f862419f196..47a41898d39 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesEnvServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesEnvServiceDiscovery.java
@@ -25,6 +25,7 @@ import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
+@Deprecated
public class KubernetesEnvServiceDiscovery extends KubernetesServiceDiscovery {
public KubernetesEnvServiceDiscovery(KubernetesConfiguration
configuration) {
super(configuration);
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscovery.java
index 65d3d184110..47740bb81f0 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscovery.java
@@ -22,6 +22,7 @@ import org.apache.camel.impl.cloud.DefaultServiceDiscovery;
/**
* Discovers where services are running on which servers in Kubernetes.
*/
+@Deprecated
public abstract class KubernetesServiceDiscovery extends
DefaultServiceDiscovery {
private final KubernetesConfiguration configuration;
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscoveryFactory.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscoveryFactory.java
index b3b5cc79e8b..c66c0301a87 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscoveryFactory.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesServiceDiscoveryFactory.java
@@ -26,6 +26,7 @@ import org.apache.camel.util.ObjectHelper;
@CloudServiceFactory("kubernetes-service-discovery")
@Configurer
+@Deprecated
public class KubernetesServiceDiscoveryFactory implements
ServiceDiscoveryFactory {
private final KubernetesConfiguration configuration;
private String lookup;
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpression.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpression.java
index 0a5e3d8b858..71cf46855ed 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpression.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpression.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.netty.http.cloud;
import org.apache.camel.impl.cloud.DefaultServiceCallExpression;
import org.apache.camel.util.ObjectHelper;
+@Deprecated
public final class NettyHttpServiceExpression extends
DefaultServiceCallExpression {
public NettyHttpServiceExpression() {
}
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpressionFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpressionFactory.java
index b0a1082760f..38dbc922e1e 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpressionFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceExpressionFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.spi.annotations.CloudServiceFactory;
@CloudServiceFactory("netty-http-service-expression")
@Configurer
+@Deprecated
public class NettyHttpServiceExpressionFactory implements
ServiceExpressionFactory {
@Override
public Expression newInstance(CamelContext camelContext) throws Exception {
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpression.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpression.java
index 3cdd0813f9d..c2151eff6a0 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpression.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpression.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.undertow.cloud;
import org.apache.camel.impl.cloud.DefaultServiceCallExpression;
import org.apache.camel.util.ObjectHelper;
+@Deprecated
public final class UndertowServiceExpression extends
DefaultServiceCallExpression {
public UndertowServiceExpression() {
}
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpressionFactory.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpressionFactory.java
index 013cb91be1a..b545449df6d 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpressionFactory.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/cloud/UndertowServiceExpressionFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.spi.annotations.CloudServiceFactory;
@CloudServiceFactory("undertow-service-expression")
@Configurer
+@Deprecated
public class UndertowServiceExpressionFactory implements
ServiceExpressionFactory {
@Override
public Expression newInstance(CamelContext camelContext) throws Exception {
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/MetaData.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/MetaData.java
index 22d467f8791..f1acd58a907 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/MetaData.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/MetaData.java
@@ -22,6 +22,7 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("meta")
+@Deprecated
public class MetaData extends HashMap<String, String> {
public MetaData() {
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
index 8e84e17d3fe..f4553bd20bc 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
@@ -35,6 +35,7 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ZooKeeperServiceDiscovery extends DefaultServiceDiscovery {
private static final Logger LOGGER =
LoggerFactory.getLogger(ZooKeeperServiceDiscovery.class);
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
index de04d8a0d32..f5269a8baa1 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
@@ -32,6 +32,7 @@ import org.apache.curator.framework.CuratorFramework;
@CloudServiceFactory("zookeeper-service-discovery")
@Configurer
+@Deprecated
public class ZooKeeperServiceDiscoveryFactory implements
ServiceDiscoveryFactory {
private ZooKeeperCuratorConfiguration configuration;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
index 1a578095dfc..1dcfcd7a511 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
@@ -34,6 +34,7 @@ import org.apache.curator.x.discovery.ServiceInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ZooKeeperServiceRegistry extends AbstractServiceRegistry {
private static final Logger LOGGER =
LoggerFactory.getLogger(ZooKeeperServiceRegistry.class);
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistryConfiguration.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistryConfiguration.java
index b99c1f865fc..21e4143e86c 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistryConfiguration.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistryConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.zookeeper.cloud;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
+@Deprecated
public class ZooKeeperServiceRegistryConfiguration extends
ZooKeeperCuratorConfiguration {
/**
* Should we remove all the registered services know by this registry on
stop?
diff --git
a/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
index 54685a85f2b..37ec723914d 100644
---
a/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
+++
b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
@@ -26,6 +26,7 @@ import java.lang.annotation.Target;
@Documented
@Target({ ElementType.TYPE })
@ServiceFactory("cloud")
+@Deprecated
public @interface CloudServiceFactory {
String value();
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index c66e519a62c..d63650557fc 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -28,8 +28,8 @@
<artifactId>camel-cloud</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Cloud</name>
- <description>Camel Cloud support (deprecated since 4.7)</description>
+ <name>Camel :: Cloud (deprecated)</name>
+ <description>Camel Cloud support</description>
<properties>
<firstVersion>3.0</firstVersion>
diff --git
a/core/camel-cloud/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/core/camel-cloud/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 247353099a8..22c93bce3e4 100644
---
a/core/camel-cloud/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++
b/core/camel-cloud/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=cloud
groupId=org.apache.camel
artifactId=camel-cloud
version=4.10.0-SNAPSHOT
-projectName=Camel :: Cloud
-projectDescription=Camel Cloud support (deprecated since 4.7)
+projectName=Camel :: Cloud (deprecated)
+projectDescription=Camel Cloud support
diff --git a/core/camel-cloud/src/generated/resources/cloud.json
b/core/camel-cloud/src/generated/resources/cloud.json
index 8e2bb16c957..ab52fd7530a 100644
--- a/core/camel-cloud/src/generated/resources/cloud.json
+++ b/core/camel-cloud/src/generated/resources/cloud.json
@@ -3,8 +3,8 @@
"kind": "other",
"name": "cloud",
"title": "Cloud",
- "description": "Camel Cloud support (deprecated since 4.7)",
- "deprecated": false,
+ "description": "Camel Cloud support",
+ "deprecated": true,
"firstVersion": "3.0",
"label": "core,cloud",
"supportLevel": "Stable",
diff --git
a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
index 54685a85f2b..37ec723914d 100644
---
a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
+++
b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/CloudServiceFactory.java
@@ -26,6 +26,7 @@ import java.lang.annotation.Target;
@Documented
@Target({ ElementType.TYPE })
@ServiceFactory("cloud")
+@Deprecated
public @interface CloudServiceFactory {
String value();
