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

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fd73ca30fbb378fa6246686bf41baddcbdd50f44
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Oct 12 11:10:07 2018 +0200

    [CAMEL-12814] Remove deprecated kubernetes component
---
 camel-core/readme.adoc                             |   2 +-
 .../src/main/docs/kubernetes-component.adoc        | 289 ---------------------
 .../component/kubernetes/KubernetesComponent.java  |  32 ---
 .../component/kubernetes/KubernetesEndpoint.java   | 157 -----------
 .../services/org/apache/camel/component/kubernetes |  18 --
 .../src/main/docs/netty4-component.adoc            |   2 +-
 components/readme.adoc                             | 107 +-------
 docs/user-manual/en/SUMMARY.md                     |  40 ---
 .../KubernetesComponentAutoConfiguration.java      | 128 ---------
 .../KubernetesComponentConfiguration.java          |  54 ----
 10 files changed, 5 insertions(+), 824 deletions(-)

diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 1243b8f..9de5b90 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -106,7 +106,7 @@ Data Formats
 
 
 // dataformats: START
-Number of Data Formats: 4 in 38 JAR artifacts (3 deprecated)
+Number of Data Formats: 4 in 34 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
diff --git 
a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc 
b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
deleted file mode 100644
index 4b48382..0000000
--- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+++ /dev/null
@@ -1,289 +0,0 @@
-[[kubernetes-component]]
-== Kubernetes Component (deprecated)
-
-*Available as of Camel version 2.17*
-
-[IMPORTANT]
-====================================================================================
-The composite kubernetes component has been deprecated. Use individual
-component splitted as following.
-
-* <<kubernetes-component,Kubernetes Components>>
-  ** <<openshift-build-configs-component,Kubernetes Build Config>>
-  ** Kubernetes Build
-  ** <<kubernetes-config-maps-component,Kubernetes ConfigMap>>
-  ** <<kubernetes-namespaces-component,Kubernetes Namespace>>
-  ** <<kubernetes-nodes-component,Kubernetes Node>>
-  ** <<kubernetes-persistent-volumes-component,Kubernetes Persistent Volume>>
-  ** <<kubernetes-persistent-volumes-claims-component,Kubernetes Persistent 
Volume Claim>>
-  ** <<kubernetes-pods-component,Kubernetes Pod>>
-  ** <<kubernetes-replication-controllers-component,Kubernetes Replication 
Controller>>
-  ** <<kubernetes-resources-quota-component,Kubernetes Resource Quota>>
-  ** <<kubernetes-secrets-component,Kubernetes Secrets>>
-  ** <<kubernetes-service-accounts-component,Kubernetes Service Account>>
-  ** <<kubernetes-services-component,Kubernetes Service>>
-====================================================================================
-
-The *Kubernetes* component is a component for integrating your
-application with Kubernetes standalone or on top of Openshift. 
-
-Maven users will need to add the following dependency to
-their `pom.xml` for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-kubernetes</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-=== URI format
-
-[source,java]
-------------------------------
-kubernetes:masterUrl[?options]
-------------------------------
-
-You can append query options to the URI in the following
-format, `?option=value&option=value&...`
-
-=== Options
-
-
-// component options: START
-The Kubernetes component has no options.
-// component options: END
-
-
-
-
-
-
-
-
-// endpoint options: START
-The Kubernetes endpoint is configured using URI syntax:
-
-----
-kubernetes:masterUrl
-----
-
-with the following path and query parameters:
-
-==== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *masterUrl* | *Required* Kubernetes Master url |  | String
-|===
-
-
-==== Query Parameters (29 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *apiVersion* (common) | The Kubernetes API Version to use |  | String
-| *category* (common) | *Required* Kubernetes Producer and Consumer category | 
 | String
-| *dnsDomain* (common) | The dns domain, used for ServiceCall EIP |  | String
-| *kubernetesClient* (common) | Default KubernetesClient to use if provided |  
| KubernetesClient
-| *portName* (common) | The port name, used for ServiceCall EIP |  | String
-| *portProtocol* (common) | The port protocol, used for ServiceCall EIP | tcp 
| String
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler, which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages, or the likes, will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions, that will be logged at WARN or ERROR level and ignored. | false | 
boolean
-| *labelKey* (consumer) | The Consumer Label key when watching at some 
resources |  | String
-| *labelValue* (consumer) | The Consumer Label value when watching at some 
resources |  | String
-| *namespace* (consumer) | The namespace |  | String
-| *poolSize* (consumer) | The Consumer pool size | 1 | int
-| *resourceName* (consumer) | The Consumer Resource Name we would like to 
watch |  | String
-| *exceptionHandler* (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
option is not in use. By default the consumer will deal with exceptions, that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
-| *operation* (producer) | Producer operation to do on Kubernetes |  | String
-| *connectionTimeout* (advanced) | Connection timeout in milliseconds to use 
when making requests to the Kubernetes API server. |  | Integer
-| *synchronous* (advanced) | Sets whether synchronous processing should be 
strictly used, or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
-| *caCertData* (security) | The CA Cert Data |  | String
-| *caCertFile* (security) | The CA Cert File |  | String
-| *clientCertData* (security) | The Client Cert Data |  | String
-| *clientCertFile* (security) | The Client Cert File |  | String
-| *clientKeyAlgo* (security) | The Key Algorithm used by the client |  | String
-| *clientKeyData* (security) | The Client Key data |  | String
-| *clientKeyFile* (security) | The Client Key file |  | String
-| *clientKeyPassphrase* (security) | The Client Key Passphrase |  | String
-| *oauthToken* (security) | The Auth Token |  | String
-| *password* (security) | Password to connect to Kubernetes |  | String
-| *trustCerts* (security) | Define if the certs we used are trusted anyway or 
not |  | Boolean
-| *username* (security) | Username to connect to Kubernetes |  | String
-|===
-// endpoint options: END
-// spring-boot-auto-configure options: START
-=== Spring Boot Auto-Configuration
-
-
-The component supports 16 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.kubernetes.cluster.service.attributes* | Custom service 
attributes. |  | Map
-| *camel.component.kubernetes.cluster.service.cluster-labels* | Set the labels 
used to identify the pods composing the cluster. |  | Map
-| *camel.component.kubernetes.cluster.service.config-map-name* | Set the name 
of the ConfigMap used to do optimistic locking (defaults to 'leaders'). |  | 
String
-| *camel.component.kubernetes.cluster.service.connection-timeout-millis* | 
Connection timeout in milliseconds to use when making requests to the 
Kubernetes API server. |  | Integer
-| *camel.component.kubernetes.cluster.service.enabled* | Sets if the 
Kubernetes cluster service should be enabled or not, default is false. | false 
| Boolean
-| *camel.component.kubernetes.cluster.service.id* | Cluster Service ID |  | 
String
-| *camel.component.kubernetes.cluster.service.jitter-factor* | A jitter factor 
to apply in order to prevent all pods to call Kubernetes APIs in the same 
instant. |  | Double
-| *camel.component.kubernetes.cluster.service.kubernetes-namespace* | Set the 
name of the Kubernetes namespace containing the pods and the configmap 
(autodetected by default) |  | String
-| *camel.component.kubernetes.cluster.service.lease-duration-millis* | The 
default duration of the lease for the current leader. |  | Long
-| *camel.component.kubernetes.cluster.service.master-url* | Set the URL of the 
Kubernetes master (read from Kubernetes client properties by default). |  | 
String
-| *camel.component.kubernetes.cluster.service.order* | Service lookup 
order/priority. |  | Integer
-| *camel.component.kubernetes.cluster.service.pod-name* | Set the name of the 
current pod (autodetected from container host name by default). |  | String
-| *camel.component.kubernetes.cluster.service.renew-deadline-millis* | The 
deadline after which the leader must stop its services because it may have lost 
the leadership. |  | Long
-| *camel.component.kubernetes.cluster.service.retry-period-millis* | The time 
between two subsequent attempts to check and acquire the leadership. It is 
randomized using the jitter factor. |  | Long
-| *camel.component.kubernetes.enabled* | Whether to enable auto configuration 
of the kubernetes component. This is enabled by default. |  | Boolean
-| *camel.component.kubernetes.resolve-property-placeholders* | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders. | true | 
Boolean
-|===
-// spring-boot-auto-configure options: END
-
-
-
-
-
-
-
-
-=== Headers
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Type |Description
-
-|CamelKubernetesOperation |String |The Producer operation
-
-|CamelKubernetesNamespaceName |String |The Namespace name
-
-|CamelKubernetesNamespaceLabels |Map |The Namespace Labels
-
-|CamelKubernetesServiceLabels |Map |The Service labels
-
-|CamelKubernetesServiceName |String |The Service name
-
-|CamelKubernetesServiceSpec |io.fabric8.kubernetes.api.model.ServiceSpec |The 
Spec for a Service
-
-|CamelKubernetesReplicationControllersLabels |Map |Replication controller 
labels
-
-|CamelKubernetesReplicationControllerName |String |Replication controller name
-
-|CamelKubernetesReplicationControllerSpec 
|io.fabric8.kubernetes.api.model.ReplicationControllerSpec |The Spec for a 
Replication Controller
-
-|CamelKubernetesReplicationControllerReplicas |Integer |The number of replicas 
for a Replication Controller during the Scale operation
-
-|CamelKubernetesPodsLabels |Map |Pod labels
-
-|CamelKubernetesPodName |String |Pod name
-
-|CamelKubernetesPodSpec |io.fabric8.kubernetes.api.model.PodSpec |The Spec for 
a Pod
-
-|CamelKubernetesPersistentVolumesLabels |Map |Persistent Volume labels
-
-|CamelKubernetesPersistentVolumesName |String |Persistent Volume name
-
-|CamelKubernetesPersistentVolumesClaimsLabels |Map |Persistent Volume Claim 
labels
-
-|CamelKubernetesPersistentVolumesClaimsName |String |Persistent Volume Claim 
name
-
-|CamelKubernetesPersistentVolumesClaimsSpec 
|io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec |The Spec for a 
Persistent Volume claim
-
-|CamelKubernetesSecretsLabels |Map |Secret labels
-
-|CamelKubernetesSecretsName |String |Secret name
-
-|CamelKubernetesSecret |io.fabric8.kubernetes.api.model.Secret |A Secret Object
-
-|CamelKubernetesResourcesQuotaLabels |Map |Resource Quota labels
-
-|CamelKubernetesResourcesQuotaName |String |Resource Quota name
-
-|CamelKubernetesResourceQuotaSpec 
|io.fabric8.kubernetes.api.model.ResourceQuotaSpec |The Spec for a Resource 
Quota
-
-|CamelKubernetesServiceAccountsLabels |Map |Service Account labels
-
-|CamelKubernetesServiceAccountName |String |Service Account name
-
-|CamelKubernetesServiceAccount |io.fabric8.kubernetes.api.model.ServiceAccount 
|A Service Account object
-
-|CamelKubernetesNodesLabels |Map |Node labels
-
-|CamelKubernetesNodeName |String |Node name
-
-|CamelKubernetesBuildsLabels |Map |Openshift Build labels
-
-|CamelKubernetesBuildName |String |Openshift Build name
-
-|CamelKubernetesBuildConfigsLabels |Map |Openshift Build Config labels
-
-|CamelKubernetesBuildConfigName |String |Openshift Build Config name
-
-|CamelKubernetesEventAction |io.fabric8.kubernetes.client.Watcher.Action 
|Action watched by the consumer
-
-|CamelKubernetesEventTimestamp |String |Timestamp of the action watched by the 
consumer
-
-|CamelKubernetesConfigMapName |String |ConfigMap name
-
-|CamelKubernetesConfigMapsLabels |Map |ConfigMap labels
-
-|CamelKubernetesConfigData |Map |ConfigMap Data
-|=======================================================================
-
-
-=== Categories
-
-Actually the camel-kubernetes component supports the following Kubernetes 
resources
-
-- Namespaces
-- Pods
-- Replication Controllers
-- Services
-- Persistent Volumes
-- Persistent Volume Claims
-- Secrets
-- Resource Quota
-- Service Accounts
-- Nodes
-- Configmaps
-
-In Openshift also
-
-- Builds
-- BuildConfigs
-
-=== Usage
-
-==== Producer examples
-
-Here we show some examples of producer using camel-kubernetes.
-
-==== Create a pod
-
-[source,java]
--------------------------------------------------------------
-from("direct:createPod")
-    .toF("kubernetes://%s?oauthToken=%s&category=pods&operation=createPod", 
host, authToken);
--------------------------------------------------------------
-
-By using the KubernetesConstants.KUBERNETES_POD_SPEC header you can specify 
your PodSpec and pass it to this operation.
-
-==== Delete a pod
-
-[source,java]
--------------------------------------------------------------
-from("direct:createPod")
-    .toF("kubernetes://%s?oauthToken=%s&category=pods&operation=deletePod", 
host, authToken);
--------------------------------------------------------------
-
-By using the KubernetesConstants.KUBERNETES_POD_NAME header you can specify 
your Pod name and pass it to this operation.
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesComponent.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesComponent.java
deleted file mode 100644
index 1b94147..0000000
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesComponent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.kubernetes;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Deprecated
-public class KubernetesComponent extends AbstractKubernetesComponent {
-
-    private static final Logger LOG = 
LoggerFactory.getLogger(KubernetesComponent.class);
-
-    protected AbstractKubernetesEndpoint doCreateEndpoint(String uri, String 
remaining, KubernetesConfiguration config) throws Exception {
-        LOG.warn("The syntax 'kubernetes://{}' has been deprecated. Use 
'kubernetes-{}://{}' instead.", remaining, config.getCategory(), remaining);
-        KubernetesEndpoint endpoint = new KubernetesEndpoint(uri, this, 
config);
-        return endpoint;
-    }
-}
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
deleted file mode 100644
index 4dd5162..0000000
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.kubernetes;
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import 
org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsProducer;
-import 
org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesConsumer;
-import 
org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesProducer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import 
org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import 
org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import 
org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import 
org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-import 
org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-import org.apache.camel.component.kubernetes.secrets.KubernetesSecretsProducer;
-import 
org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsProducer;
-import 
org.apache.camel.component.kubernetes.services.KubernetesServicesConsumer;
-import 
org.apache.camel.component.kubernetes.services.KubernetesServicesProducer;
-import 
org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsProducer;
-import org.apache.camel.component.openshift.builds.OpenshiftBuildsProducer;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Use splitted kubernetes components instead of this composite component.
- * @deprecated
- */
-@Deprecated
-@UriEndpoint(firstVersion = "2.17.0", scheme = "kubernetes", title = 
"Kubernetes", syntax = "kubernetes:masterUrl", label = "container,cloud,paas")
-public class KubernetesEndpoint extends AbstractKubernetesEndpoint {
-
-    private static final Logger LOG = 
LoggerFactory.getLogger(KubernetesEndpoint.class);
-
-    @UriParam(enums = 
"namespaces,services,replicationControllers,pods,persistentVolumes,persistentVolumesClaims,secrets,resourcesQuota,serviceAccounts,nodes,configMaps,builds,buildConfigs")
-    @Metadata(required = "true")
-    private String category;
-
-    public KubernetesEndpoint(String uri, KubernetesComponent component, 
KubernetesConfiguration config) {
-        super(uri, component, config);
-        category = config.getCategory();
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        if (ObjectHelper.isEmpty(category)) {
-            throw new IllegalArgumentException("A producer category must be 
specified");
-        } else {
-            switch (category) {
-
-            case KubernetesCategory.NAMESPACES:
-                return new KubernetesNamespacesProducer(this);
-
-            case KubernetesCategory.SERVICES:
-                return new KubernetesServicesProducer(this);
-
-            case KubernetesCategory.REPLICATION_CONTROLLERS:
-                return new KubernetesReplicationControllersProducer(this);
-
-            case KubernetesCategory.PODS:
-                return new KubernetesPodsProducer(this);
-
-            case KubernetesCategory.PERSISTENT_VOLUMES:
-                return new KubernetesPersistentVolumesProducer(this);
-
-            case KubernetesCategory.PERSISTENT_VOLUMES_CLAIMS:
-                return new KubernetesPersistentVolumesClaimsProducer(this);
-
-            case KubernetesCategory.SECRETS:
-                return new KubernetesSecretsProducer(this);
-
-            case KubernetesCategory.RESOURCES_QUOTA:
-                return new KubernetesResourcesQuotaProducer(this);
-
-            case KubernetesCategory.SERVICE_ACCOUNTS:
-                return new KubernetesServiceAccountsProducer(this);
-
-            case KubernetesCategory.NODES:
-                return new KubernetesNodesProducer(this);
-                
-            case KubernetesCategory.CONFIGMAPS:
-                return new KubernetesConfigMapsProducer(this);
-
-            case KubernetesCategory.BUILDS:
-                return new OpenshiftBuildsProducer(this);
-
-            case KubernetesCategory.BUILD_CONFIGS:
-                return new OpenshiftBuildConfigsProducer(this);
-
-            default:
-                throw new IllegalArgumentException("The " + category + " 
producer category doesn't exist");
-            }
-        }
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        if (ObjectHelper.isEmpty(category)) {
-            throw new IllegalArgumentException("A consumer category must be 
specified");
-        } else {
-            switch (category) {
-
-            case KubernetesCategory.PODS:
-                return new KubernetesPodsConsumer(this, processor);
-
-            case KubernetesCategory.SERVICES:
-                return new KubernetesServicesConsumer(this, processor);
-
-            case KubernetesCategory.REPLICATION_CONTROLLERS:
-                return new KubernetesReplicationControllersConsumer(this, 
processor);
-                
-            case KubernetesCategory.NAMESPACES:
-                return new KubernetesNamespacesConsumer(this, processor);
-                
-            case KubernetesCategory.NODES:
-                return new KubernetesNodesConsumer(this, processor);
-
-            default:
-                throw new IllegalArgumentException("The " + category + " 
consumer category doesn't exist");
-            }
-        }
-    }
-
-    /**
-     * Kubernetes Producer and Consumer category
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-}
diff --git 
a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes
 
b/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes
deleted file mode 100644
index 4d2f23e..0000000
--- 
a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.camel.component.kubernetes.KubernetesComponent
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc 
b/components/camel-netty4/src/main/docs/netty4-component.adoc
index 2d6eb0b..705c6d7 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -143,7 +143,7 @@ with the following path and query parameters:
 | *udpByteArrayCodec* (advanced) | For UDP only. If enabled the using byte 
array codec instead of Java serialization protocol. | false | boolean
 | *workerCount* (advanced) | When netty works on nio mode, it uses default 
workerCount parameter from Netty, which is cpu_core_threads x 2. User can use 
this operation to override the default workerCount from Netty. |  | int
 | *workerGroup* (advanced) | To use a explicit EventLoopGroup as the boss 
thread pool. For example to share a thread pool with multiple consumers or 
producers. By default each consumer or producer has their own worker pool with 
2 x cpu count core threads. |  | EventLoopGroup
-| *allowDefaultCodec* (codec) | The netty component installs a default codec 
if both, encoder/deocder is null and textline is false. Setting 
allowDefaultCodec to false prevents the netty component from installing a 
default codec as the first element in the filter chain. | true | boolean
+| *allowDefaultCodec* (codec) | The netty component installs a default codec 
if both, encoder/decoder is null and textline is false. Setting 
allowDefaultCodec to false prevents the netty component from installing a 
default codec as the first element in the filter chain. | true | boolean
 | *autoAppendDelimiter* (codec) | Whether or not to auto append missing end 
delimiter when sending using the textline codec. | true | boolean
 | *decoder* (codec) | *Deprecated* A custom ChannelHandler class that can be 
used to perform special marshalling of inbound payloads. |  | ChannelHandler
 | *decoderMaxLineLength* (codec) | The max line length to use for the textline 
codec. | 1024 | int
diff --git a/components/readme.adoc b/components/readme.adoc
index fadba62..7d8a917 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -146,9 +146,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc[Caffeine 
LoadCache] (camel-caffeine) +
 `caffeine-loadcache:cacheName` | 2.20 | The caffeine-loadcache component is 
used for integration with Caffeine Load Cache.
 
-| link:camel-context/src/main/docs/context-component.adoc[Camel Context] 
(camel-context) +
-`context:contextId:localEndpointUrl` | 2.7 | *deprecated* The context 
component allows to send/receive messages between Camel routes in a black box 
way.
-
 | link:camel-cassandraql/src/main/docs/cql-component.adoc[Cassandra CQL] 
(camel-cassandraql) +
 `cql:beanRef:hosts:port/keyspace` | 2.15 | The cql component aims at 
integrating Cassandra 2.0 using the CQL3 API (not the Thrift API).
 
@@ -230,9 +227,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-dropbox/src/main/docs/dropbox-component.adoc[Dropbox] 
(camel-dropbox) +
 `dropbox:operation` | 2.14 | For uploading, downloading and managing files, 
folders, groups, collaborations, etc on dropbox DOT com.
 
-| link:camel-cache/src/main/docs/cache-component.adoc[EHCache] (camel-cache) +
-`cache:cacheName` | 2.1 | *deprecated* The cache component enables you to 
perform caching operations using EHCache as the Cache Implementation.
-
 | link:camel-ehcache/src/main/docs/ehcache-component.adoc[Ehcache] 
(camel-ehcache) +
 `ehcache:cacheName` | 2.18 | The ehcache component enables you to perform 
caching operations using Ehcache as cache implementation.
 
@@ -242,12 +236,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | 
link:camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc[Elastichsearch
 Rest] (camel-elasticsearch-rest) +
 `elasticsearch-rest:clusterName` | 2.21 | The elasticsearch component is used 
for interfacing with ElasticSearch server using REST API.
 
-| 
link:camel-elasticsearch/src/main/docs/elasticsearch-component.adoc[Elasticsearch]
 (camel-elasticsearch) +
-`elasticsearch:clusterName` | 2.11 | *deprecated* The elasticsearch component 
is used for interfacing with ElasticSearch server.
-
-| 
link:camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc[Elasticsearch5]
 (camel-elasticsearch5) +
-`elasticsearch5:clusterName` | 2.19 | *deprecated* The elasticsearch component 
is used for interfacing with ElasticSearch server using 5.x API.
-
 | link:camel-elsql/src/main/docs/elsql-component.adoc[ElSQL] (camel-elsql) +
 `elsql:elsqlName:resourceUri` | 2.16 | The elsql component is an extension to 
the existing SQL Component that uses ElSql to define the SQL queries.
 
@@ -362,24 +350,15 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-hbase/src/main/docs/hbase-component.adoc[HBase] (camel-hbase) +
 `hbase:tableName` | 2.10 | For reading/writing from/to an HBase store (Hadoop 
database).
 
-| link:camel-hdfs/src/main/docs/hdfs-component.adoc[HDFS] (camel-hdfs) +
-`hdfs:hostName:port/path` | 2.8 | *deprecated* For reading/writing from/to an 
HDFS filesystem using Hadoop 1.x.
-
 | link:camel-hdfs2/src/main/docs/hdfs2-component.adoc[HDFS2] (camel-hdfs2) +
 `hdfs2:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS 
filesystem using Hadoop 2.x.
 
 | link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat] 
(camel-hipchat) +
 `hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing 
and consuming messages from/to Hipchat service.
 
-| link:camel-http/src/main/docs/http-component.adoc[HTTP] (camel-http) +
-`http:httpUri` | 1.0 | *deprecated* For calling out to external HTTP servers 
using Apache HTTP Client 3.x.
-
 | link:camel-http4/src/main/docs/http4-component.adoc[HTTP4] (camel-http4) +
 `http4:httpUri` | 2.3 | For calling out to external HTTP servers using Apache 
HTTP Client 4.x.
 
-| link:camel-ibatis/src/main/docs/ibatis-component.adoc[iBatis] (camel-ibatis) 
+
-`ibatis:statement` | 1.2 | *deprecated* Performs a query, poll, insert, update 
or delete in a relational database using Apache iBATIS.
-
 | link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 
Client] (camel-iec60870) +
 `iec60870-client:uriPath` | 2.20 | IEC 60870 component used for telecontrol 
(supervisory control and data acquisition) such as controlling electric power 
transmission grids and other geographically widespread control systems.
 
@@ -419,9 +398,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-ironmq/src/main/docs/ironmq-component.adoc[IronMQ] (camel-ironmq) 
+
 `ironmq:queueName` | 2.17 | The ironmq provides integration with IronMQ an 
elastic and durable hosted message queue as a service.
 
-| link:camel-javaspace/src/main/docs/javaspace-component.adoc[JavaSpace] 
(camel-javaspace) +
-`javaspace:url` | 2.1 | *deprecated* Sending and receiving messages through 
JavaSpace.
-
 | link:camel-jbpm/src/main/docs/jbpm-component.adoc[JBPM] (camel-jbpm) +
 `jbpm:connectionURL` | 2.6 | The jbpm component provides integration with jBPM 
(Business Process Management).
 
@@ -449,9 +425,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-jing/src/main/docs/jing-component.adoc[Jing] (camel-jing) +
 `jing:resourceUri` | 1.1 | Validates the payload of a message using RelaxNG 
Syntax using Jing library.
 
-| link:camel-jira/src/main/docs/jira-component.adoc[JIRA] (camel-jira) +
-`jira:type` | 2.15 | *deprecated* The jira component interacts with the JIRA 
issue tracker.
-
 | link:camel-jms/src/main/docs/jms-component.adoc[JMS] (camel-jms) +
 `jms:destinationType:destinationName` | 1.0 | The jms component allows 
messages to be sent to (or consumed from) a JMS Queue or Topic.
 
@@ -473,15 +446,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) +
 `kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or 
consumed from) Apache Kafka brokers.
 
-| link:camel-kestrel/src/main/docs/kestrel-component.adoc[Kestrel] 
(camel-kestrel) +
-`kestrel:addresses/queue` | 2.6 | *deprecated* The kestrel component allows 
messages to be sent to (or consumed from) Kestrel brokers.
-
-| link:camel-krati/src/main/docs/krati-component.adoc[Krati] (camel-krati) +
-`krati:path` | 2.9 | *deprecated* The krati allows the use krati datastores 
and datasets inside Camel.
-
-| link:camel-kubernetes/src/main/docs/kubernetes-component.adoc[Kubernetes] 
(camel-kubernetes) +
-`kubernetes:masterUrl` | 2.17 | *deprecated* Use splitted kubernetes 
components instead of this composite component.
-
 | 
link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes
 ConfigMap] (camel-kubernetes) +
 `kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps 
component provides a producer to execute kubernetes configmap operations.
 
@@ -557,9 +521,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-micrometer/src/main/docs/micrometer-component.adoc[Micrometer] 
(camel-micrometer) +
 `micrometer:metricsType:metricsName` | 2.22 | To collect various metrics 
directly from Camel routes using the Micrometer library.
 
-| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
-`mina:protocol:host:port` | 1.0 | *deprecated* Socket level networking using 
TCP or UDP with the Apache Mina 1.x library.
-
 | link:camel-mina2/src/main/docs/mina2-component.adoc[Mina2] (camel-mina2) +
 `mina2:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP 
with the Apache Mina 2.x library.
 
@@ -569,9 +530,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:../camel-core/src/main/docs/mock-component.adoc[Mock] (camel-core) +
 `mock:name` | 1.0 | The mock component is used for testing routes and 
mediation rules using mocks.
 
-| link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] 
(camel-mongodb) +
-`mongodb:connectionBean` | 2.10 | *deprecated* Component for working with 
documents stored in MongoDB database.
-
 | link:camel-mongodb3/src/main/docs/mongodb3-component.adoc[MongoDB] 
(camel-mongodb3) +
 `mongodb3:connectionBean` | 2.19 | Component for working with documents stored 
in MongoDB database.
 
@@ -602,12 +560,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) +
 `nats:servers` | 2.17 | The nats component allows you produce and consume 
messages from NATS.
 
-| link:camel-netty/src/main/docs/netty-component.adoc[Netty] (camel-netty) +
-`netty:protocol:host:port` | 2.3 | *deprecated* Socket level networking using 
TCP or UDP with the Netty 3.x library.
-
-| link:camel-netty-http/src/main/docs/netty-http-component.adoc[Netty HTTP] 
(camel-netty-http) +
-`netty-http:protocol:host:port/path` | 2.12 | *deprecated* Netty HTTP server 
and client using the Netty 3.x library.
-
 | link:camel-netty4/src/main/docs/netty4-component.adoc[Netty4] (camel-netty4) 
+
 `netty4:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP 
with the Netty 4.x library.
 
@@ -626,9 +578,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-milo/src/main/docs/milo-server-component.adoc[OPC UA Server] 
(camel-milo) +
 `milo-server:itemId` | 2.19 | Make telemetry data available as an OPC UA server
 
-| link:camel-openshift/src/main/docs/openshift-component.adoc[OpenShift] 
(camel-openshift) +
-`openshift:clientId` | 2.14 | *deprecated* To manage your Openshift 2.x 
applications.
-
 | 
link:camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc[Openshift
 Build Config] (camel-kubernetes) +
 `openshift-build-configs:masterUrl` | 2.17 | The Kubernetes Build Config 
component provides a producer to execute kubernetes build config operations.
 
@@ -680,9 +629,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-pubnub/src/main/docs/pubnub-component.adoc[PubNub] (camel-pubnub) 
+
 `pubnub:channel` | 2.19 | To send and receive messages to PubNub data stream 
network for connected devices.
 
-| link:camel-quartz/src/main/docs/quartz-component.adoc[Quartz] (camel-quartz) 
+
-`quartz:groupName/timerName` | 1.0 | *deprecated* Provides a scheduled 
delivery of messages using the Quartz 1.x scheduler.
-
 | link:camel-quartz2/src/main/docs/quartz2-component.adoc[Quartz2] 
(camel-quartz2) +
 `quartz2:groupName/triggerName` | 2.12 | Provides a scheduled delivery of 
messages using the Quartz 2.x scheduler.
 
@@ -713,9 +659,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-rmi/src/main/docs/rmi-component.adoc[RMI] (camel-rmi) +
 `rmi:hostname:port/name` | 1.0 | The rmi component is for invoking Java RMI 
beans from Camel.
 
-| link:camel-routebox/src/main/docs/routebox-component.adoc[RouteBox] 
(camel-routebox) +
-`routebox:routeboxName` | 2.6 | *deprecated* The routebox component allows to 
send/receive messages between Camel routes in a black box way.
-
 | link:camel-rss/src/main/docs/rss-component.adoc[RSS] (camel-rss) +
 `rss:feedUri` | 2.0 | The rss component is used for consuming RSS feeds.
 
@@ -842,9 +785,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-twilio/src/main/docs/twilio-component.adoc[Twilio] (camel-twilio) 
+
 `twilio:apiName/methodName` | 2.20 | The Twilio component allows you to 
interact with the Twilio REST APIs using Twilio Java SDK.
 
-| link:camel-twitter/src/main/docs/twitter-component.adoc[Twitter] 
(camel-twitter) +
-`twitter:kind` | 2.10 | *deprecated* Use twitter-directmessage, 
twitter-search, twitter-streaming and twitter-timeline instead of this 
component.
-
 | 
link:camel-twitter/src/main/docs/twitter-directmessage-component.adoc[Twitter 
Direct Message] (camel-twitter) +
 `twitter-directmessage:user` | 2.10 | The Twitter Direct Message Component 
consumes/produces user's direct messages.
 
@@ -884,9 +824,6 @@ Number of Components: 281 in 185 JAR artifacts (1 
deprecated)
 | link:camel-xchange/src/main/docs/xchange-component.adoc[XChange] 
(camel-xchange) +
 `xchange:name` | 2.21 | The camel-xchange component provide access to many 
bitcoin and altcoin exchanges for trading and accessing market data.
 
-| link:camel-xmlrpc/src/main/docs/xmlrpc-component.adoc[XML RPC] 
(camel-xmlrpc) +
-`xmlrpc:address` | 2.11 | *deprecated* The xmlrpc component is used for 
sending messages to a XML RPC service.
-
 | link:camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc[XML 
Security] (camel-xmlsecurity) +
 `xmlsecurity:command:name` | 2.12 | Used to sign and verify exchanges using 
the XML signature specification.
 
@@ -922,7 +859,7 @@ Data Formats
 ^^^^^^^^^^^^
 
 // dataformats: START
-Number of Data Formats: 47 in 38 JAR artifacts (3 deprecated)
+Number of Data Formats: 43 in 34 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -954,8 +891,6 @@ Number of Data Formats: 47 in 38 JAR artifacts (3 
deprecated)
 
 | link:../camel-core/src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | 
2.0 | The GZip data format is a message compression and de-compression format 
(which works with the popular gzip/gunzip tools).
 
-| link:camel-hessian/src/main/docs/hessian-dataformat.adoc[Hessian] 
(camel-hessian) | 2.17 | *deprecated* Hessian data format is used for 
marshalling and unmarshalling messages using Cauchos Hessian format.
-
 | link:camel-hl7/src/main/docs/hl7-dataformat.adoc[HL7] (camel-hl7) | 2.0 | 
The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model 
objects.
 
 | link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12 
| The iCal dataformat is used for working with iCalendar messages.
@@ -1006,12 +941,6 @@ Number of Data Formats: 47 in 38 JAR artifacts (3 
deprecated)
 
 | 
link:camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc[uniVocity
 TSV] (camel-univocity-parsers) | 2.15 | The uniVocity TSV data format is used 
for working with TSV (Tabular Separated Values) flat payloads.
 
-| link:camel-xmlbeans/src/main/docs/xmlBeans-dataformat.adoc[XML Beans] 
(camel-xmlbeans) | 1.2 | *deprecated* XML Beans data format is used for 
unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
-
-| link:camel-xmljson/src/main/docs/xmljson-dataformat.adoc[XML JSon] 
(camel-xmljson) | 2.10 | *deprecated* XML JSon data format can convert from XML 
to JSON and vice-versa directly, without stepping through intermediate POJOs.
-
-| link:camel-xmlrpc/src/main/docs/xmlrpc-dataformat.adoc[XML RPC] 
(camel-xmlrpc) | 2.11 | The XML RPC data format is used for working with the 
XML RPC protocol.
-
 | link:camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc[XML Security] 
(camel-xmlsecurity) | 2.0 | The XML Security data format facilitates encryption 
and decryption of XML payloads.
 
 | link:camel-xstream/src/main/docs/xstream-dataformat.adoc[XStream] 
(camel-xstream) | 1.3 | XSTream data format is used for unmarshal a XML payload 
to POJO or to marshal POJO back to XML payload.
@@ -1029,7 +958,7 @@ Expression Languages
 ^^^^^^^^^^^^^^^^^^^^
 
 // languages: START
-Number of Languages: 20 in 11 JAR artifacts (2 deprecated)
+Number of Languages: 18 in 9 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -1053,8 +982,6 @@ Number of Languages: 20 in 11 JAR artifacts (2 deprecated)
 
 | link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] 
(camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.
 
-| link:camel-jxpath/src/main/docs/jxpath-language.adoc[JXPath] (camel-jxpath) 
| 1.3 | *deprecated* To use JXPath in Camel expressions or predicates.
-
 | link:camel-mvel/src/main/docs/mvel-language.adoc[MVEL] (camel-mvel) | 2.0 | 
To use MVEL scripts in Camel expressions or predicates.
 
 | link:camel-ognl/src/main/docs/ognl-language.adoc[OGNL] (camel-ognl) | 1.1 | 
To use OGNL scripts in Camel expressions or predicates.
@@ -1065,8 +992,6 @@ Number of Languages: 20 in 11 JAR artifacts (2 deprecated)
 
 | link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 
2.7 | To use Spring Expression Language (SpEL) in Camel expressions or 
predicates.
 
-| link:camel-josql/src/main/docs/sql-language.adoc[SQL] (camel-josql) | 1.0 | 
*deprecated* To use SQL (on Java beans) in Camel expressions or predicates.
-
 | link:../camel-core/src/main/docs/tokenize-language.adoc[Tokenize] 
(camel-core) | 2.0 | To use Camel message body or header with a tokenizer in 
Camel expressions or predicates.
 
 | link:../camel-core/src/main/docs/xtokenize-language.adoc[XML Tokenize] 
(camel-core) | 2.14 | To use Camel message body or header with a XML tokenizer 
in Camel expressions or predicates.
@@ -1082,28 +1007,18 @@ Miscellaneous Components
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 // others: START
-Number of Miscellaneous Components: 44 in 44 JAR artifacts (13 deprecated)
+Number of Miscellaneous Components: 31 in 31 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
 | Component | Available From | Description
 
-| link:camel-bam/src/main/docs/bam.adoc[BAM] (camel-bam) | 1.0 | *deprecated* 
Business Activity Monitoring
-
 | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] 
(camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
 
 | link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel 
with CDI
 
 | link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] 
(camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF
 
-| link:camel-eclipse/src/main/docs/eclipse.adoc[Eclipse] (camel-eclipse) | 2.3 
| *deprecated* Camel classpath scanning support for running in Eclipse Desktop 
Applications
-
-| link:camel-groovy-dsl/src/main/docs/groovy-dsl.adoc[Groovy DSL] 
(camel-groovy-dsl) | 2.19 | *deprecated* Camel Groovy DSL support
-
-| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5 | 
*deprecated* Using Camel with Guice
-
-| link:camel-hawtdb/src/main/docs/hawtdb.adoc[HawtDB] (camel-hawtdb) | 2.3 | 
*deprecated* Using HawtDB as persistent EIP store
-
 | link:camel-headersmap/src/main/docs/headersmap.adoc[Headersmap] 
(camel-headersmap) | 2.20 | Fast case-insensitive headers map implementation
 
 | link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 
2.18 | Circuit Breaker EIP using Netflix Hystrix
@@ -1122,18 +1037,8 @@ Number of Miscellaneous Components: 44 in 44 JAR 
artifacts (13 deprecated)
 
 | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | 
Using Netflix Ribbon for client side load balancing
 
-| link:camel-ruby/src/main/docs/ruby.adoc[Ruby] (camel-ruby) | 1.0 | 
*deprecated* Camel Ruby DSL
-
-| link:camel-rx/src/main/docs/rx.adoc[RX] (camel-rx) | 2.11 | *deprecated* 
Camel Reactive using RxJava library
-
 | link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 
2.22 | RxJava2 based back-end for Camel's reactive streams component
 
-| link:camel-scala/src/main/docs/scala.adoc[Scala DSL] (camel-scala) | 1.4 | 
*deprecated* Camel Scala DSL
-
-| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | *deprecated* 
Camel with OSGi SCR (Declarative Services)
-
-| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet 
Listener] (camel-servletlistener) | 2.11 | *deprecated* Bootstrapping Camel 
using Servet Listener
-
 | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | 
Security using Shiro
 
 | link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] 
(camel-spring-boot) | 2.15 | Using Camel with Spring Boot
@@ -1150,8 +1055,6 @@ Number of Miscellaneous Components: 44 in 44 JAR 
artifacts (13 deprecated)
 
 | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring 
Security] (camel-spring-security) | 2.3 | Security using Spring Security
 
-| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 
2.14 | *deprecated* Rest-dsl support for using swagger api-doc (uses Scala)
-
 | link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] 
(camel-swagger-java) | 2.16 | Rest-dsl support for using swagger api-doc
 
 | link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9 | Camel 
unit testing
@@ -1168,10 +1071,6 @@ Number of Miscellaneous Components: 44 in 44 JAR 
artifacts (13 deprecated)
 
 | 
link:camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc[Testcontainers
 Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring 
and testcontainers
 
-| link:camel-testng/src/main/docs/testng.adoc[TestNG] (camel-testng) | 2.8 | 
*deprecated* Camel unit testing with TestNG
-
-| link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[URLRewrite] 
(camel-urlrewrite) | 2.11 | *deprecated* URL rewrite support for HTTP components
-
 | link:camel-aws-xray/src/main/docs/aws-xray.adoc[XRay] (camel-aws-xray) | 
2.21 | Distributed tracing using AWS XRay
 
 | link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18 | 
Distributed message tracing using Zipkin
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 49ccab0..fbf4435 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -166,7 +166,6 @@
        * [Braintree](braintree-component.adoc)
        * [Caffeine Cache](caffeine-cache-component.adoc)
        * [Caffeine LoadCache](caffeine-loadcache-component.adoc)
-       * [Camel Context](context-component.adoc)
        * [Cassandra CQL](cql-component.adoc)
        * [Chronicle Engine](chronicle-engine-component.adoc)
        * [Chunk](chunk-component.adoc)
@@ -188,12 +187,9 @@
        * [Dozer](dozer-component.adoc)
        * [Drill](drill-component.adoc)
        * [Dropbox](dropbox-component.adoc)
-       * [EHCache](cache-component.adoc)
        * [Ehcache](ehcache-component.adoc)
        * [EJB](ejb-component.adoc)
        * [Elastichsearch Rest](elasticsearch-rest-component.adoc)
-       * [Elasticsearch](elasticsearch-component.adoc)
-       * [Elasticsearch5](elasticsearch5-component.adoc)
        * [ElSQL](elsql-component.adoc)
        * [etcd](etcd-component.adoc)
        * [Exec](exec-component.adoc)
@@ -231,12 +227,9 @@
        * [Hazelcast Set](hazelcast-set-component.adoc)
        * [Hazelcast Topic](hazelcast-topic-component.adoc)
        * [HBase](hbase-component.adoc)
-       * [HDFS](hdfs-component.adoc)
        * [HDFS2](hdfs2-component.adoc)
        * [Hipchat](hipchat-component.adoc)
-       * [HTTP](http-component.adoc)
        * [HTTP4](http4-component.adoc)
-       * [iBatis](ibatis-component.adoc)
        * [IEC 60870 Client](iec60870-client-component.adoc)
        * [IEC 60870 Server](iec60870-server-component.adoc)
        * [Ignite Cache](ignite-cache-component.adoc)
@@ -251,7 +244,6 @@
        * [InfluxDB](influxdb-component.adoc)
        * [IRC](irc-component.adoc)
        * [IronMQ](ironmq-component.adoc)
-       * [JavaSpace](javaspace-component.adoc)
        * [JBPM](jbpm-component.adoc)
        * [JCache](jcache-component.adoc)
        * [JClouds](jclouds-component.adoc)
@@ -261,7 +253,6 @@
        * [Jetty Websocket](websocket-component.adoc)
        * [JGroups](jgroups-component.adoc)
        * [Jing](jing-component.adoc)
-       * [JIRA](jira-component.adoc)
        * [JMS](jms-component.adoc)
        * [JMX](jmx-component.adoc)
        * [JOLT](jolt-component.adoc)
@@ -269,9 +260,6 @@
        * [JSON Schema Validator](json-validator-component.adoc)
        * [JT400](jt400-component.adoc)
        * [Kafka](kafka-component.adoc)
-       * [Kestrel](kestrel-component.adoc)
-       * [Krati](krati-component.adoc)
-       * [Kubernetes](kubernetes-component.adoc)
        * [Kubernetes ConfigMap](kubernetes-config-maps-component.adoc)
        * [Kubernetes Deployments](kubernetes-deployments-component.adoc)
        * [Kubernetes HPA](kubernetes-hpa-component.adoc)
@@ -294,10 +282,8 @@
        * [Master](master-component.adoc)
        * [Metrics](metrics-component.adoc)
        * [Micrometer](micrometer-component.adoc)
-       * [Mina](mina-component.adoc)
        * [Mina2](mina2-component.adoc)
        * [MLLP](mllp-component.adoc)
-       * [MongoDB](mongodb-component.adoc)
        * [MongoDB](mongodb3-component.adoc)
        * [MongoDB GridFS](mongodb-gridfs-component.adoc)
        * [MQTT](mqtt-component.adoc)
@@ -308,15 +294,12 @@
        * [MyBatis Bean](mybatis-bean-component.adoc)
        * [Nagios](nagios-component.adoc)
        * [Nats](nats-component.adoc)
-       * [Netty](netty-component.adoc)
-       * [Netty HTTP](netty-http-component.adoc)
        * [Netty4](netty4-component.adoc)
        * [Netty4 HTTP](netty4-http-component.adoc)
        * [Olingo2](olingo2-component.adoc)
        * [Olingo4](olingo4-component.adoc)
        * [OPC UA Client](milo-client-component.adoc)
        * [OPC UA Server](milo-server-component.adoc)
-       * [OpenShift](openshift-component.adoc)
        * [Openshift Build Config](openshift-build-configs-component.adoc)
        * [Openshift Builds](openshift-builds-component.adoc)
        * [OpenStack Cinder](openstack-cinder-component.adoc)
@@ -333,7 +316,6 @@
        * [PostgresSQL Event](pgevent-component.adoc)
        * [Printer](lpr-component.adoc)
        * [PubNub](pubnub-component.adoc)
-       * [Quartz](quartz-component.adoc)
        * [Quartz2](quartz2-component.adoc)
        * [QuickFix](quickfix-component.adoc)
        * [RabbitMQ](rabbitmq-component.adoc)
@@ -341,7 +323,6 @@
        * [REST Swagger](rest-swagger-component.adoc)
        * [Restlet](restlet-component.adoc)
        * [RMI](rmi-component.adoc)
-       * [RouteBox](routebox-component.adoc)
        * [RSS](rss-component.adoc)
        * [Salesforce](salesforce-component.adoc)
        * [SAP NetWeaver](sap-netweaver-component.adoc)
@@ -378,7 +359,6 @@
        * [Thrift](thrift-component.adoc)
        * [Tika](tika-component.adoc)
        * [Twilio](twilio-component.adoc)
-       * [Twitter](twitter-component.adoc)
        * [Twitter Direct Message](twitter-directmessage-component.adoc)
        * [Twitter Search](twitter-search-component.adoc)
        * [Twitter Streaming](twitter-streaming-component.adoc)
@@ -390,7 +370,6 @@
        * [Web3j Ethereum Blockchain](web3j-component.adoc)
        * [Wordpress](wordpress-component.adoc)
        * [XChange](xchange-component.adoc)
-       * [XML RPC](xmlrpc-component.adoc)
        * [XML Security](xmlsecurity-component.adoc)
        * [XMPP](xmpp-component.adoc)
        * [XQuery](xquery-component.adoc)
@@ -406,14 +385,9 @@
 
 <!-- others: START -->
 * Miscellaneous Components
-       * [BAM](bam.adoc)
        * [Blueprint](blueprint.adoc)
        * [CDI](cdi.adoc)
        * [CXF Transport](cxf-transport.adoc)
-       * [Eclipse](eclipse.adoc)
-       * [Groovy DSL](groovy-dsl.adoc)
-       * [Guice](guice.adoc)
-       * [HawtDB](hawtdb.adoc)
        * [Headersmap](headersmap.adoc)
        * [Hystrix](hystrix.adoc)
        * [Jasypt](jasypt.adoc)
@@ -423,12 +397,7 @@
        * [OpenTracing](opentracing.adoc)
        * [Reactor](reactor.adoc)
        * [Ribbon](ribbon.adoc)
-       * [Ruby](ruby.adoc)
-       * [RX](rx.adoc)
        * [Rxjava2](rxjava2.adoc)
-       * [Scala DSL](scala.adoc)
-       * [SCR](scr.adoc)
-       * [Servlet Listener](servletlistener.adoc)
        * [Shiro](shiro.adoc)
        * [Spring Boot](spring-boot.adoc)
        * [Spring Cloud](spring-cloud.adoc)
@@ -437,7 +406,6 @@
        * [Spring Cloud Zookeeper](spring-cloud-zookeeper.adoc)
        * [Spring Java Configuration](spring-javaconfig.adoc)
        * [Spring Security](spring-security.adoc)
-       * [Swagger](swagger.adoc)
        * [Swagger Java](swagger-java.adoc)
        * [Test](test.adoc)
        * [Test Blueprint](test-blueprint.adoc)
@@ -446,8 +414,6 @@
        * [Test Spring](test-spring.adoc)
        * [Testcontainers](testcontainers.adoc)
        * [Testcontainers Spring](testcontainers-spring.adoc)
-       * [TestNG](testng.adoc)
-       * [URLRewrite](urlrewrite.adoc)
        * [XRay](aws-xray.adoc)
        * [Zipkin](zipkin.adoc)
 <!-- others: END -->
@@ -468,7 +434,6 @@
        * [CSV](csv-dataformat.adoc)
        * [Flatpack](flatpack-dataformat.adoc)
        * [GZip](gzip-dataformat.adoc)
-       * [Hessian](hessian-dataformat.adoc)
        * [HL7](hl7-dataformat.adoc)
        * [iCal](ical-dataformat.adoc)
        * [JacksonXML](jacksonxml-dataformat.adoc)
@@ -494,9 +459,6 @@
        * [uniVocity CSV](univocity-csv-dataformat.adoc)
        * [uniVocity Fixed Length](univocity-fixed-dataformat.adoc)
        * [uniVocity TSV](univocity-tsv-dataformat.adoc)
-       * [XML Beans](xmlBeans-dataformat.adoc)
-       * [XML JSon](xmljson-dataformat.adoc)
-       * [XML RPC](xmlrpc-dataformat.adoc)
        * [XML Security](secureXML-dataformat.adoc)
        * [XStream](xstream-dataformat.adoc)
        * [YAML SnakeYAML](yaml-snakeyaml-dataformat.adoc)
@@ -523,13 +485,11 @@
        * [HL7 Terser](terser-language.adoc)
        * [JavaScript](javaScript-language.adoc)
        * [JsonPath](jsonpath-language.adoc)
-       * [JXPath](jxpath-language.adoc)
        * [MVEL](mvel-language.adoc)
        * [OGNL](ognl-language.adoc)
        * [Ref](ref-language.adoc)
        * [Simple](simple-language.adoc)
        * [SpEL](spel-language.adoc)
-       * [SQL](sql-language.adoc)
        * [Tokenize](tokenize-language.adoc)
        * [XML Tokenize](xtokenize-language.adoc)
        * [XPath](xpath-language.adoc)
diff --git 
a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentAutoConfiguration.java
deleted file mode 100644
index 7a7fc62..0000000
--- 
a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentAutoConfiguration.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.kubernetes.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.kubernetes.KubernetesComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.util.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@Configuration
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
-        KubernetesComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
-        KubernetesComponentConfiguration.class})
-public class KubernetesComponentAutoConfiguration {
-
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(KubernetesComponentAutoConfiguration.class);
-    @Autowired
-    private ApplicationContext applicationContext;
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private KubernetesComponentConfiguration configuration;
-    @Autowired(required = false)
-    private List<ComponentCustomizer<KubernetesComponent>> customizers;
-
-    static class GroupConditions extends GroupCondition {
-        public GroupConditions() {
-            super("camel.component", "camel.component.kubernetes");
-        }
-    }
-
-    @Lazy
-    @Bean(name = "kubernetes-component")
-    @ConditionalOnMissingBean(KubernetesComponent.class)
-    public KubernetesComponent configureKubernetesComponent() throws Exception 
{
-        KubernetesComponent component = new KubernetesComponent();
-        component.setCamelContext(camelContext);
-        Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null,
-                false);
-        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
-            Object value = entry.getValue();
-            Class<?> paramClass = value.getClass();
-            if (paramClass.getName().endsWith("NestedConfiguration")) {
-                Class nestedClass = null;
-                try {
-                    nestedClass = (Class) paramClass.getDeclaredField(
-                            "CAMEL_NESTED_CLASS").get(null);
-                    HashMap<String, Object> nestedParameters = new HashMap<>();
-                    IntrospectionSupport.getProperties(value, nestedParameters,
-                            null, false);
-                    Object nestedProperty = nestedClass.newInstance();
-                    CamelPropertiesHelper.setCamelProperties(camelContext,
-                            nestedProperty, nestedParameters, false);
-                    entry.setValue(nestedProperty);
-                } catch (NoSuchFieldException e) {
-                }
-            }
-        }
-        CamelPropertiesHelper.setCamelProperties(camelContext, component,
-                parameters, false);
-        if (ObjectHelper.isNotEmpty(customizers)) {
-            for (ComponentCustomizer<KubernetesComponent> customizer : 
customizers) {
-                boolean useCustomizer = (customizer instanceof HasId)
-                        ? HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.kubernetes.customizer",
-                                ((HasId) customizer).getId())
-                        : HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.kubernetes.customizer");
-                if (useCustomizer) {
-                    LOGGER.debug("Configure component {}, with customizer {}",
-                            component, customizer);
-                    customizer.customize(component);
-                }
-            }
-        }
-        return component;
-    }
-}
\ No newline at end of file
diff --git 
a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentConfiguration.java
deleted file mode 100644
index be63bf2..0000000
--- 
a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/KubernetesComponentConfiguration.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.kubernetes.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Use splitted kubernetes components instead of this composite component.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.kubernetes")
-public class KubernetesComponentConfiguration
-        extends
-            ComponentConfigurationPropertiesCommon {
-
-    /**
-     * Whether to enable auto configuration of the kubernetes component. This 
is
-     * enabled by default.
-     */
-    private Boolean enabled;
-    /**
-     * Whether the component should resolve property placeholders on itself 
when
-     * starting. Only properties which are of String type can use property
-     * placeholders.
-     */
-    private Boolean resolvePropertyPlaceholders = true;
-
-    public Boolean getResolvePropertyPlaceholders() {
-        return resolvePropertyPlaceholders;
-    }
-
-    public void setResolvePropertyPlaceholders(
-            Boolean resolvePropertyPlaceholders) {
-        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
-    }
-}
\ No newline at end of file

Reply via email to