You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/04/26 11:18:15 UTC

[camel] 03/03: CAMEL-19290 - camel-solr - Remove component as its not maintainable

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

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

commit 4433c12a7765be78a876191541f267415b67ef4d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 26 12:38:48 2023 +0200

    CAMEL-19290 - camel-solr - Remove component as its not maintainable
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../org/apache/camel/catalog/components.properties |   3 -
 .../org/apache/camel/catalog/components/solr.json  |  58 --
 .../apache/camel/catalog/components/solrCloud.json |  58 --
 .../org/apache/camel/catalog/components/solrs.json |  58 --
 .../org/apache/camel/catalog/others.properties     |   2 -
 .../apache/camel/catalog/others/componentdsl.json  |  15 -
 .../apache/camel/catalog/others/endpointdsl.json   |  15 -
 .../org/apache/camel/main/components.properties    |   3 -
 .../modules/ROOT/examples/json/solr.json           |   1 -
 .../modules/ROOT/examples/json/solrCloud.json      |   1 -
 .../modules/ROOT/examples/json/solrs.json          |   1 -
 docs/components/modules/ROOT/nav.adoc              |   1 -
 .../modules/ROOT/pages/solr-component.adoc         |   1 -
 .../component/ComponentsBuilderFactory.java        |  39 -
 .../component/dsl/SolrComponentBuilderFactory.java | 117 ---
 .../dsl/SolrcloudComponentBuilderFactory.java      | 121 ----
 .../dsl/SolrsComponentBuilderFactory.java          | 118 ----
 .../src/generated/resources/metadata.json          |  69 --
 .../builder/endpoint/EndpointBuilderFactory.java   |   1 -
 .../camel/builder/endpoint/EndpointBuilders.java   |   1 -
 .../builder/endpoint/StaticEndpointBuilders.java   |  47 --
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   | 781 ---------------------
 .../camel-component-known-dependencies.properties  |   1 -
 23 files changed, 1512 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index a035d5e429a..0bda77cf51f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -272,9 +272,6 @@ smpps
 smtp
 smtps
 snmp
-solr
-solrCloud
-solrs
 splunk
 splunk-hec
 spring-batch
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
deleted file mode 100644
index 0691c024dee..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "solr",
-    "title": "Solr",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solr",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solr:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-  },
-  "headers": {
-    "CamelSolrClient": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The client.", "constantName": "org.apache.camel.component.solr.SolrConstants#CLIENT" },
-    "CamelSolrCollection": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collection to execute the request again.", "constantName": "org.apache.camel.component.solr.SolrConstants#COLLECTION" },
-    "SolrOperation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.solr.SolrConstants#OPERATION" },
-    "CamelSolrQueryString": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The query to execute.", "constantName": "org.apache.camel.component.solr.SolrConstants#QUERY_STRING" },
-    "Content-Type": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type.", "constantName": "org.apache.camel.component.solr.SolrConstants#CONTENT_TYPE" }
-  },
-  "properties": {
-    "url": { "kind": "path", "displayName": "Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Hostname and port for the Solr server(s). Multiple hosts can be specified, separated with a comma. See the solrClient parame [...]
-    "autoCommit": { "kind": "parameter", "displayName": "Auto Commit", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "If true, each producer operation will be automatically followed by a commit" },
-    "connectionTimeout": { "kind": "parameter", "displayName": "Connection Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the connection timeout on the SolrClient" },
-    "defaultMaxConnectionsPerHost": { "kind": "parameter", "displayName": "Default Max Connections Per Host", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxConnectionsPerHost on the underlying HttpConnectionManager" },
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.client.HttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the http client to be used by the solrClient. This is only applicable when solrClient is not set." },
-    "maxRetries": { "kind": "parameter", "displayName": "Max Retries", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Maximum number of retries to attempt in the event of transient errors" },
-    "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total Connections", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxTotalConnection on the underlying HttpConnectionManager" },
-    "requestHandler": { "kind": "parameter", "displayName": "Request Handler", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the request handler to be used" },
-    "solrClient": { "kind": "parameter", "displayName": "Solr Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Uses the provided solr client to connect to solr. When this parameter is not specified, camel applies t [...]
-    "soTimeout": { "kind": "parameter", "displayName": "So Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the socket timeout on the SolrClient" },
-    "streamingQueueSize": { "kind": "parameter", "displayName": "Streaming Queue Size", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the queue size for the ConcurrentUpdateSolrClient" },
-    "streamingThreadCount": { "kind": "parameter", "displayName": "Streaming Thread Count", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the number of threads for the ConcurrentUpdateSolrClient" },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
-    "collection": { "kind": "parameter", "displayName": "Collection", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the default collection for SolrCloud" },
-    "zkChroot": { "kind": "parameter", "displayName": "Zk Chroot", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the chroot of the zookeeper connection (include the leading slash; e.g. '\/mychroot')" },
-    "zkHost": { "kind": "parameter", "displayName": "Zk Host", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the ZooKeeper host(s) urls which the CloudSolrClient uses, e.g. zkHost=localhost:2181,localhost:2182. Option [...]
-    "allowCompression": { "kind": "parameter", "displayName": "Allow Compression", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Server side must support gzip or deflate for this to have any effect" },
-    "followRedirects": { "kind": "parameter", "displayName": "Follow Redirects", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Indicates whether redirects are used to get to the Solr server" },
-    "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets password for basic auth plugin enabled servers" },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets username for basic auth plugin enabled servers" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json
deleted file mode 100644
index 8a5b3edf6a4..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "solrCloud",
-    "title": "Solr",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solrCloud",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solrCloud:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-  },
-  "headers": {
-    "CamelSolrClient": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The client.", "constantName": "org.apache.camel.component.solr.SolrConstants#CLIENT" },
-    "CamelSolrCollection": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collection to execute the request again.", "constantName": "org.apache.camel.component.solr.SolrConstants#COLLECTION" },
-    "SolrOperation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.solr.SolrConstants#OPERATION" },
-    "CamelSolrQueryString": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The query to execute.", "constantName": "org.apache.camel.component.solr.SolrConstants#QUERY_STRING" },
-    "Content-Type": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type.", "constantName": "org.apache.camel.component.solr.SolrConstants#CONTENT_TYPE" }
-  },
-  "properties": {
-    "url": { "kind": "path", "displayName": "Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Hostname and port for the Solr server(s). Multiple hosts can be specified, separated with a comma. See the solrClient parame [...]
-    "autoCommit": { "kind": "parameter", "displayName": "Auto Commit", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "If true, each producer operation will be automatically followed by a commit" },
-    "connectionTimeout": { "kind": "parameter", "displayName": "Connection Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the connection timeout on the SolrClient" },
-    "defaultMaxConnectionsPerHost": { "kind": "parameter", "displayName": "Default Max Connections Per Host", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxConnectionsPerHost on the underlying HttpConnectionManager" },
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.client.HttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the http client to be used by the solrClient. This is only applicable when solrClient is not set." },
-    "maxRetries": { "kind": "parameter", "displayName": "Max Retries", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Maximum number of retries to attempt in the event of transient errors" },
-    "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total Connections", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxTotalConnection on the underlying HttpConnectionManager" },
-    "requestHandler": { "kind": "parameter", "displayName": "Request Handler", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the request handler to be used" },
-    "solrClient": { "kind": "parameter", "displayName": "Solr Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Uses the provided solr client to connect to solr. When this parameter is not specified, camel applies t [...]
-    "soTimeout": { "kind": "parameter", "displayName": "So Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the socket timeout on the SolrClient" },
-    "streamingQueueSize": { "kind": "parameter", "displayName": "Streaming Queue Size", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the queue size for the ConcurrentUpdateSolrClient" },
-    "streamingThreadCount": { "kind": "parameter", "displayName": "Streaming Thread Count", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the number of threads for the ConcurrentUpdateSolrClient" },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
-    "collection": { "kind": "parameter", "displayName": "Collection", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the default collection for SolrCloud" },
-    "zkChroot": { "kind": "parameter", "displayName": "Zk Chroot", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the chroot of the zookeeper connection (include the leading slash; e.g. '\/mychroot')" },
-    "zkHost": { "kind": "parameter", "displayName": "Zk Host", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the ZooKeeper host(s) urls which the CloudSolrClient uses, e.g. zkHost=localhost:2181,localhost:2182. Option [...]
-    "allowCompression": { "kind": "parameter", "displayName": "Allow Compression", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Server side must support gzip or deflate for this to have any effect" },
-    "followRedirects": { "kind": "parameter", "displayName": "Follow Redirects", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Indicates whether redirects are used to get to the Solr server" },
-    "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets password for basic auth plugin enabled servers" },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets username for basic auth plugin enabled servers" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json
deleted file mode 100644
index 805226a5be1..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "solrs",
-    "title": "Solr (Secure)",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solrs",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solrs:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-  },
-  "headers": {
-    "CamelSolrClient": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The client.", "constantName": "org.apache.camel.component.solr.SolrConstants#CLIENT" },
-    "CamelSolrCollection": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collection to execute the request again.", "constantName": "org.apache.camel.component.solr.SolrConstants#COLLECTION" },
-    "SolrOperation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.solr.SolrConstants#OPERATION" },
-    "CamelSolrQueryString": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The query to execute.", "constantName": "org.apache.camel.component.solr.SolrConstants#QUERY_STRING" },
-    "Content-Type": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type.", "constantName": "org.apache.camel.component.solr.SolrConstants#CONTENT_TYPE" }
-  },
-  "properties": {
-    "url": { "kind": "path", "displayName": "Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Hostname and port for the Solr server(s). Multiple hosts can be specified, separated with a comma. See the solrClient parame [...]
-    "autoCommit": { "kind": "parameter", "displayName": "Auto Commit", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "If true, each producer operation will be automatically followed by a commit" },
-    "connectionTimeout": { "kind": "parameter", "displayName": "Connection Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the connection timeout on the SolrClient" },
-    "defaultMaxConnectionsPerHost": { "kind": "parameter", "displayName": "Default Max Connections Per Host", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxConnectionsPerHost on the underlying HttpConnectionManager" },
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.client.HttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the http client to be used by the solrClient. This is only applicable when solrClient is not set." },
-    "maxRetries": { "kind": "parameter", "displayName": "Max Retries", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Maximum number of retries to attempt in the event of transient errors" },
-    "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total Connections", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "maxTotalConnection on the underlying HttpConnectionManager" },
-    "requestHandler": { "kind": "parameter", "displayName": "Request Handler", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the request handler to be used" },
-    "solrClient": { "kind": "parameter", "displayName": "Solr Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.solr.client.solrj.SolrClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Uses the provided solr client to connect to solr. When this parameter is not specified, camel applies t [...]
-    "soTimeout": { "kind": "parameter", "displayName": "So Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the socket timeout on the SolrClient" },
-    "streamingQueueSize": { "kind": "parameter", "displayName": "Streaming Queue Size", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the queue size for the ConcurrentUpdateSolrClient" },
-    "streamingThreadCount": { "kind": "parameter", "displayName": "Streaming Thread Count", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets the number of threads for the ConcurrentUpdateSolrClient" },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
-    "collection": { "kind": "parameter", "displayName": "Collection", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the default collection for SolrCloud" },
-    "zkChroot": { "kind": "parameter", "displayName": "Zk Chroot", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the chroot of the zookeeper connection (include the leading slash; e.g. '\/mychroot')" },
-    "zkHost": { "kind": "parameter", "displayName": "Zk Host", "group": "CloudSolrClient", "label": "CloudSolrClient", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Set the ZooKeeper host(s) urls which the CloudSolrClient uses, e.g. zkHost=localhost:2181,localhost:2182. Option [...]
-    "allowCompression": { "kind": "parameter", "displayName": "Allow Compression", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Server side must support gzip or deflate for this to have any effect" },
-    "followRedirects": { "kind": "parameter", "displayName": "Follow Redirects", "group": "HttpSolrClient", "label": "HttpSolrClient", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Indicates whether redirects are used to get to the Solr server" },
-    "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets password for basic auth plugin enabled servers" },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.solr.SolrConfiguration", "configurationField": "solrConfiguration", "description": "Sets username for basic auth plugin enabled servers" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index ae3a8d69eeb..adca4dd58fe 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -4,14 +4,12 @@ cli-connector
 cloud
 cloudevents
 cluster
-componentdsl
 console
 csimple-joor
 debug
 dsl-modeline
 dsl-support
 elytron
-endpointdsl
 groovy-dsl
 headersmap
 health
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
deleted file mode 100644
index 3799e772735..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "componentdsl",
-    "title": "Java Component DSL",
-    "description": "The Camel Component DSL",
-    "deprecated": false,
-    "firstVersion": "3.1.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-componentdsl",
-    "version": "4.0.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
deleted file mode 100644
index cea1951ad69..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "endpointdsl",
-    "title": "Java Endpoint DSL",
-    "description": "The Camel Endpoint DSL",
-    "deprecated": false,
-    "firstVersion": "3.0.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-endpointdsl",
-    "version": "4.0.0-SNAPSHOT"
-  }
-}
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
index a035d5e429a..0bda77cf51f 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
@@ -272,9 +272,6 @@ smpps
 smtp
 smtps
 snmp
-solr
-solrCloud
-solrs
 splunk
 splunk-hec
 spring-batch
diff --git a/docs/components/modules/ROOT/examples/json/solr.json b/docs/components/modules/ROOT/examples/json/solr.json
deleted file mode 120000
index e6bd296d196..00000000000
--- a/docs/components/modules/ROOT/examples/json/solr.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-solr/src/generated/resources/org/apache/camel/component/solr/solr.json
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/json/solrCloud.json b/docs/components/modules/ROOT/examples/json/solrCloud.json
deleted file mode 120000
index 3129a772793..00000000000
--- a/docs/components/modules/ROOT/examples/json/solrCloud.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-solr/src/generated/resources/org/apache/camel/component/solr/solrCloud.json
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/json/solrs.json b/docs/components/modules/ROOT/examples/json/solrs.json
deleted file mode 120000
index 384b6708da9..00000000000
--- a/docs/components/modules/ROOT/examples/json/solrs.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-solr/src/generated/resources/org/apache/camel/component/solr/solrs.json
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 1d8fb609550..3df2b14b01e 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -276,7 +276,6 @@
 ** xref:slack-component.adoc[Slack]
 ** xref:smpp-component.adoc[SMPP]
 ** xref:snmp-component.adoc[SNMP]
-** xref:solr-component.adoc[Solr]
 ** xref:splunk-component.adoc[Splunk]
 ** xref:splunk-hec-component.adoc[Splunk HEC]
 ** xref:spring-summary.adoc[Spring]
diff --git a/docs/components/modules/ROOT/pages/solr-component.adoc b/docs/components/modules/ROOT/pages/solr-component.adoc
deleted file mode 120000
index a9c497e68a8..00000000000
--- a/docs/components/modules/ROOT/pages/solr-component.adoc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../components/camel-solr/src/main/docs/solr-component.adoc
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 57af8c3c262..291a8516ead 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3687,45 +3687,6 @@ public interface ComponentsBuilderFactory {
     static org.apache.camel.builder.component.dsl.SnmpComponentBuilderFactory.SnmpComponentBuilder snmp() {
         return org.apache.camel.builder.component.dsl.SnmpComponentBuilderFactory.snmp();
     }
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static org.apache.camel.builder.component.dsl.SolrComponentBuilderFactory.SolrComponentBuilder solr() {
-        return org.apache.camel.builder.component.dsl.SolrComponentBuilderFactory.solr();
-    }
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static org.apache.camel.builder.component.dsl.SolrcloudComponentBuilderFactory.SolrcloudComponentBuilder solrcloud() {
-        return org.apache.camel.builder.component.dsl.SolrcloudComponentBuilderFactory.solrcloud();
-    }
-    /**
-     * Solr (Secure) (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static org.apache.camel.builder.component.dsl.SolrsComponentBuilderFactory.SolrsComponentBuilder solrs() {
-        return org.apache.camel.builder.component.dsl.SolrsComponentBuilderFactory.solrs();
-    }
     /**
      * Splunk (camel-splunk)
      * Publish or search for events in Splunk.
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java
deleted file mode 100644
index b86cad1f465..00000000000
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java
+++ /dev/null
@@ -1,117 +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.builder.component.dsl;
-
-import javax.annotation.processing.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.solr.SolrComponent;
-
-/**
- * Perform operations against Apache Lucene Solr.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface SolrComponentBuilderFactory {
-
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static SolrComponentBuilder solr() {
-        return new SolrComponentBuilderImpl();
-    }
-
-    /**
-     * Builder for the Solr component.
-     */
-    interface SolrComponentBuilder extends ComponentBuilder<SolrComponent> {
-        /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default SolrComponentBuilder lazyStartProducer(boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
-         * Whether autowiring is enabled. This is used for automatic autowiring
-         * options (the option must be marked as autowired) by looking up in the
-         * registry to find if there is a single instance of matching type,
-         * which then gets configured on the component. This can be used for
-         * automatic configuring JDBC data sources, JMS connection factories,
-         * AWS Clients, etc.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param autowiredEnabled the value to set
-         * @return the dsl builder
-         */
-        default SolrComponentBuilder autowiredEnabled(boolean autowiredEnabled) {
-            doSetProperty("autowiredEnabled", autowiredEnabled);
-            return this;
-        }
-    }
-
-    class SolrComponentBuilderImpl
-            extends
-                AbstractComponentBuilder<SolrComponent>
-            implements
-                SolrComponentBuilder {
-        @Override
-        protected SolrComponent buildConcreteComponent() {
-            return new SolrComponent();
-        }
-        @Override
-        protected boolean setPropertyOnComponent(
-                Component component,
-                String name,
-                Object value) {
-            switch (name) {
-            case "lazyStartProducer": ((SolrComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "autowiredEnabled": ((SolrComponent) component).setAutowiredEnabled((boolean) value); return true;
-            default: return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java
deleted file mode 100644
index dc067f492ac..00000000000
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java
+++ /dev/null
@@ -1,121 +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.builder.component.dsl;
-
-import javax.annotation.processing.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.solr.SolrComponent;
-
-/**
- * Perform operations against Apache Lucene Solr.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface SolrcloudComponentBuilderFactory {
-
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static SolrcloudComponentBuilder solrcloud() {
-        return new SolrcloudComponentBuilderImpl();
-    }
-
-    /**
-     * Builder for the Solr component.
-     */
-    interface SolrcloudComponentBuilder
-            extends
-                ComponentBuilder<SolrComponent> {
-        /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default SolrcloudComponentBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
-         * Whether autowiring is enabled. This is used for automatic autowiring
-         * options (the option must be marked as autowired) by looking up in the
-         * registry to find if there is a single instance of matching type,
-         * which then gets configured on the component. This can be used for
-         * automatic configuring JDBC data sources, JMS connection factories,
-         * AWS Clients, etc.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param autowiredEnabled the value to set
-         * @return the dsl builder
-         */
-        default SolrcloudComponentBuilder autowiredEnabled(
-                boolean autowiredEnabled) {
-            doSetProperty("autowiredEnabled", autowiredEnabled);
-            return this;
-        }
-    }
-
-    class SolrcloudComponentBuilderImpl
-            extends
-                AbstractComponentBuilder<SolrComponent>
-            implements
-                SolrcloudComponentBuilder {
-        @Override
-        protected SolrComponent buildConcreteComponent() {
-            return new SolrComponent();
-        }
-        @Override
-        protected boolean setPropertyOnComponent(
-                Component component,
-                String name,
-                Object value) {
-            switch (name) {
-            case "lazyStartProducer": ((SolrComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "autowiredEnabled": ((SolrComponent) component).setAutowiredEnabled((boolean) value); return true;
-            default: return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java
deleted file mode 100644
index 55a8c4c405e..00000000000
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java
+++ /dev/null
@@ -1,118 +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.builder.component.dsl;
-
-import javax.annotation.processing.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.solr.SolrComponent;
-
-/**
- * Perform operations against Apache Lucene Solr.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface SolrsComponentBuilderFactory {
-
-    /**
-     * Solr (Secure) (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * @return the dsl builder
-     */
-    static SolrsComponentBuilder solrs() {
-        return new SolrsComponentBuilderImpl();
-    }
-
-    /**
-     * Builder for the Solr (Secure) component.
-     */
-    interface SolrsComponentBuilder extends ComponentBuilder<SolrComponent> {
-        /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default SolrsComponentBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
-         * Whether autowiring is enabled. This is used for automatic autowiring
-         * options (the option must be marked as autowired) by looking up in the
-         * registry to find if there is a single instance of matching type,
-         * which then gets configured on the component. This can be used for
-         * automatic configuring JDBC data sources, JMS connection factories,
-         * AWS Clients, etc.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: true
-         * Group: advanced
-         * 
-         * @param autowiredEnabled the value to set
-         * @return the dsl builder
-         */
-        default SolrsComponentBuilder autowiredEnabled(boolean autowiredEnabled) {
-            doSetProperty("autowiredEnabled", autowiredEnabled);
-            return this;
-        }
-    }
-
-    class SolrsComponentBuilderImpl
-            extends
-                AbstractComponentBuilder<SolrComponent>
-            implements
-                SolrsComponentBuilder {
-        @Override
-        protected SolrComponent buildConcreteComponent() {
-            return new SolrComponent();
-        }
-        @Override
-        protected boolean setPropertyOnComponent(
-                Component component,
-                String name,
-                Object value) {
-            switch (name) {
-            case "lazyStartProducer": ((SolrComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "autowiredEnabled": ((SolrComponent) component).setAutowiredEnabled((boolean) value); return true;
-            default: return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index fa22f2ab897..face96afe87 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -6079,75 +6079,6 @@
     "producerOnly": false,
     "lenientProperties": false
   },
-  "SolrComponentBuilderFactory": {
-    "kind": "component",
-    "name": "solr",
-    "title": "Solr",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solr",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solr:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "SolrcloudComponentBuilderFactory": {
-    "kind": "component",
-    "name": "solrCloud",
-    "title": "Solr",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solrCloud",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solrCloud:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "SolrsComponentBuilderFactory": {
-    "kind": "component",
-    "name": "solrs",
-    "title": "Solr (Secure)",
-    "description": "Perform operations against Apache Lucene Solr.",
-    "deprecated": false,
-    "firstVersion": "2.9.0",
-    "label": "monitoring,search",
-    "javaType": "org.apache.camel.component.solr.SolrComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-solr",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "solrs",
-    "extendsScheme": "",
-    "alternativeSchemes": "solr,solrs,solrCloud",
-    "syntax": "solrs:url",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
   "SplunkComponentBuilderFactory": {
     "kind": "component",
     "name": "splunk",
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 43a47b7cf3b..96a5eb6c2d7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -290,7 +290,6 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory.SmppBuilders,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory.SnmpBuilders,
             org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory.Sns2Builders,
-            org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrBuilders,
             org.apache.camel.builder.endpoint.dsl.SplunkEndpointBuilderFactory.SplunkBuilders,
             org.apache.camel.builder.endpoint.dsl.SplunkHECEndpointBuilderFactory.SplunkHECBuilders,
             org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchBuilders,
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index 14225958e2d..7f0731519f4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -287,7 +287,6 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SplunkEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SplunkHECEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory,
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 079270d8f31..92370bc9c54 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -12692,53 +12692,6 @@ public class StaticEndpointBuilders {
             String path) {
         return org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory.endpointBuilder(componentName, path);
     }
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * Syntax: <code>solr:url</code>
-     * 
-     * Path parameter: url (required)
-     * Hostname and port for the Solr server(s). Multiple hosts can be
-     * specified, separated with a comma. See the solrClient parameter for more
-     * information on the SolrClient used to connect to Solr.
-     * 
-     * @param path url
-     * @return the dsl builder
-     */
-    public static org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrEndpointBuilder solr(
-            String path) {
-        return org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.endpointBuilder("solr", path);
-    }
-    /**
-     * Solr (camel-solr)
-     * Perform operations against Apache Lucene Solr.
-     * 
-     * Category: monitoring,search
-     * Since: 2.9
-     * Maven coordinates: org.apache.camel:camel-solr
-     * 
-     * Syntax: <code>solr:url</code>
-     * 
-     * Path parameter: url (required)
-     * Hostname and port for the Solr server(s). Multiple hosts can be
-     * specified, separated with a comma. See the solrClient parameter for more
-     * information on the SolrClient used to connect to Solr.
-     * 
-     * @param componentName to use a custom component name for the endpoint
-     * instead of the default name
-     * @param path url
-     * @return the dsl builder
-     */
-    public static org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrEndpointBuilder solr(
-            String componentName,
-            String path) {
-        return org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.endpointBuilder(componentName, path);
-    }
     /**
      * Splunk (camel-splunk)
      * Publish or search for events in Splunk.
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
deleted file mode 100644
index dc9ccb9682f..00000000000
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
+++ /dev/null
@@ -1,781 +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.builder.endpoint.dsl;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.*;
-import java.util.stream.*;
-import javax.annotation.processing.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-
-/**
- * Perform operations against Apache Lucene Solr.
- * 
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface SolrEndpointBuilderFactory {
-
-
-    /**
-     * Builder for endpoint for the Solr component.
-     */
-    public interface SolrEndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedSolrEndpointBuilder advanced() {
-            return (AdvancedSolrEndpointBuilder) this;
-        }
-        /**
-         * If true, each producer operation will be automatically followed by a
-         * commit.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param autoCommit the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder autoCommit(boolean autoCommit) {
-            doSetProperty("autoCommit", autoCommit);
-            return this;
-        }
-        /**
-         * If true, each producer operation will be automatically followed by a
-         * commit.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: false
-         * Group: producer
-         * 
-         * @param autoCommit the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder autoCommit(String autoCommit) {
-            doSetProperty("autoCommit", autoCommit);
-            return this;
-        }
-        /**
-         * Sets the connection timeout on the SolrClient.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder connectionTimeout(Integer connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * Sets the connection timeout on the SolrClient.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param connectionTimeout the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder connectionTimeout(String connectionTimeout) {
-            doSetProperty("connectionTimeout", connectionTimeout);
-            return this;
-        }
-        /**
-         * maxConnectionsPerHost on the underlying HttpConnectionManager.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param defaultMaxConnectionsPerHost the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder defaultMaxConnectionsPerHost(
-                Integer defaultMaxConnectionsPerHost) {
-            doSetProperty("defaultMaxConnectionsPerHost", defaultMaxConnectionsPerHost);
-            return this;
-        }
-        /**
-         * maxConnectionsPerHost on the underlying HttpConnectionManager.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param defaultMaxConnectionsPerHost the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder defaultMaxConnectionsPerHost(
-                String defaultMaxConnectionsPerHost) {
-            doSetProperty("defaultMaxConnectionsPerHost", defaultMaxConnectionsPerHost);
-            return this;
-        }
-        /**
-         * Sets the http client to be used by the solrClient. This is only
-         * applicable when solrClient is not set.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.http.client.HttpClient&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param httpClient the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder httpClient(
-                org.apache.http.client.HttpClient httpClient) {
-            doSetProperty("httpClient", httpClient);
-            return this;
-        }
-        /**
-         * Sets the http client to be used by the solrClient. This is only
-         * applicable when solrClient is not set.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.http.client.HttpClient&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param httpClient the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder httpClient(String httpClient) {
-            doSetProperty("httpClient", httpClient);
-            return this;
-        }
-        /**
-         * Maximum number of retries to attempt in the event of transient
-         * errors.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param maxRetries the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder maxRetries(Integer maxRetries) {
-            doSetProperty("maxRetries", maxRetries);
-            return this;
-        }
-        /**
-         * Maximum number of retries to attempt in the event of transient
-         * errors.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param maxRetries the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder maxRetries(String maxRetries) {
-            doSetProperty("maxRetries", maxRetries);
-            return this;
-        }
-        /**
-         * maxTotalConnection on the underlying HttpConnectionManager.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param maxTotalConnections the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder maxTotalConnections(
-                Integer maxTotalConnections) {
-            doSetProperty("maxTotalConnections", maxTotalConnections);
-            return this;
-        }
-        /**
-         * maxTotalConnection on the underlying HttpConnectionManager.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param maxTotalConnections the value to set
-         * @return the dsl builder
-         */
-        @Deprecated
-        default SolrEndpointBuilder maxTotalConnections(
-                String maxTotalConnections) {
-            doSetProperty("maxTotalConnections", maxTotalConnections);
-            return this;
-        }
-        /**
-         * Set the request handler to be used.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param requestHandler the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder requestHandler(String requestHandler) {
-            doSetProperty("requestHandler", requestHandler);
-            return this;
-        }
-        /**
-         * Uses the provided solr client to connect to solr. When this parameter
-         * is not specified, camel applies the following rules to determine the
-         * SolrClient: 1) when zkHost or zkChroot (=zookeeper root) parameter is
-         * set, then the CloudSolrClient is used. 2) when multiple hosts are
-         * specified in the uri (separated with a comma), then the
-         * CloudSolrClient (uri scheme is 'solrCloud') or the LBHttpSolrClient
-         * (uri scheme is not 'solrCloud') is used. 3) when the solr operation
-         * is INSERT_STREAMING, then the ConcurrentUpdateSolrClient is used. 4)
-         * otherwise, the HttpSolrClient is used. Note: A CloudSolrClient should
-         * point to zookeeper endpoint(s); other clients point to Solr
-         * endpoint(s). The SolrClient can also be set via the exchange header
-         * 'CamelSolrClient'.
-         * 
-         * The option is a:
-         * &lt;code&gt;org.apache.solr.client.solrj.SolrClient&lt;/code&gt;
-         * type.
-         * 
-         * Group: producer
-         * 
-         * @param solrClient the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solrClient(
-                org.apache.solr.client.solrj.SolrClient solrClient) {
-            doSetProperty("solrClient", solrClient);
-            return this;
-        }
-        /**
-         * Uses the provided solr client to connect to solr. When this parameter
-         * is not specified, camel applies the following rules to determine the
-         * SolrClient: 1) when zkHost or zkChroot (=zookeeper root) parameter is
-         * set, then the CloudSolrClient is used. 2) when multiple hosts are
-         * specified in the uri (separated with a comma), then the
-         * CloudSolrClient (uri scheme is 'solrCloud') or the LBHttpSolrClient
-         * (uri scheme is not 'solrCloud') is used. 3) when the solr operation
-         * is INSERT_STREAMING, then the ConcurrentUpdateSolrClient is used. 4)
-         * otherwise, the HttpSolrClient is used. Note: A CloudSolrClient should
-         * point to zookeeper endpoint(s); other clients point to Solr
-         * endpoint(s). The SolrClient can also be set via the exchange header
-         * 'CamelSolrClient'.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;org.apache.solr.client.solrj.SolrClient&lt;/code&gt;
-         * type.
-         * 
-         * Group: producer
-         * 
-         * @param solrClient the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solrClient(String solrClient) {
-            doSetProperty("solrClient", solrClient);
-            return this;
-        }
-        /**
-         * Sets the socket timeout on the SolrClient.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param soTimeout the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder soTimeout(Integer soTimeout) {
-            doSetProperty("soTimeout", soTimeout);
-            return this;
-        }
-        /**
-         * Sets the socket timeout on the SolrClient.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Integer&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param soTimeout the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder soTimeout(String soTimeout) {
-            doSetProperty("soTimeout", soTimeout);
-            return this;
-        }
-        /**
-         * Sets the queue size for the ConcurrentUpdateSolrClient.
-         * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: 10
-         * Group: producer
-         * 
-         * @param streamingQueueSize the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder streamingQueueSize(int streamingQueueSize) {
-            doSetProperty("streamingQueueSize", streamingQueueSize);
-            return this;
-        }
-        /**
-         * Sets the queue size for the ConcurrentUpdateSolrClient.
-         * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: 10
-         * Group: producer
-         * 
-         * @param streamingQueueSize the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder streamingQueueSize(String streamingQueueSize) {
-            doSetProperty("streamingQueueSize", streamingQueueSize);
-            return this;
-        }
-        /**
-         * Sets the number of threads for the ConcurrentUpdateSolrClient.
-         * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: 2
-         * Group: producer
-         * 
-         * @param streamingThreadCount the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder streamingThreadCount(
-                int streamingThreadCount) {
-            doSetProperty("streamingThreadCount", streamingThreadCount);
-            return this;
-        }
-        /**
-         * Sets the number of threads for the ConcurrentUpdateSolrClient.
-         * 
-         * The option will be converted to a &lt;code&gt;int&lt;/code&gt; type.
-         * 
-         * Default: 2
-         * Group: producer
-         * 
-         * @param streamingThreadCount the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder streamingThreadCount(
-                String streamingThreadCount) {
-            doSetProperty("streamingThreadCount", streamingThreadCount);
-            return this;
-        }
-        /**
-         * Set the default collection for SolrCloud.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: CloudSolrClient
-         * 
-         * @param collection the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder collection(String collection) {
-            doSetProperty("collection", collection);
-            return this;
-        }
-        /**
-         * Set the chroot of the zookeeper connection (include the leading
-         * slash; e.g. '/mychroot').
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: CloudSolrClient
-         * 
-         * @param zkChroot the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder zkChroot(String zkChroot) {
-            doSetProperty("zkChroot", zkChroot);
-            return this;
-        }
-        /**
-         * Set the ZooKeeper host(s) urls which the CloudSolrClient uses, e.g.
-         * zkHost=localhost:2181,localhost:2182. Optionally add the chroot, e.g.
-         * zkHost=localhost:2181,localhost:2182/rootformysolr. In case the first
-         * part of the url path (='contextroot') is set to 'solr' (e.g.
-         * 'localhost:2181/solr' or 'localhost:2181/solr/..'), then that path is
-         * not considered as zookeeper chroot for backward compatibility reasons
-         * (this behaviour can be overridden via zkChroot parameter).
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: CloudSolrClient
-         * 
-         * @param zkHost the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder zkHost(String zkHost) {
-            doSetProperty("zkHost", zkHost);
-            return this;
-        }
-        /**
-         * Server side must support gzip or deflate for this to have any effect.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Group: HttpSolrClient
-         * 
-         * @param allowCompression the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder allowCompression(Boolean allowCompression) {
-            doSetProperty("allowCompression", allowCompression);
-            return this;
-        }
-        /**
-         * Server side must support gzip or deflate for this to have any effect.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Group: HttpSolrClient
-         * 
-         * @param allowCompression the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder allowCompression(String allowCompression) {
-            doSetProperty("allowCompression", allowCompression);
-            return this;
-        }
-        /**
-         * Indicates whether redirects are used to get to the Solr server.
-         * 
-         * The option is a: &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Group: HttpSolrClient
-         * 
-         * @param followRedirects the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder followRedirects(Boolean followRedirects) {
-            doSetProperty("followRedirects", followRedirects);
-            return this;
-        }
-        /**
-         * Indicates whether redirects are used to get to the Solr server.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.lang.Boolean&lt;/code&gt; type.
-         * 
-         * Group: HttpSolrClient
-         * 
-         * @param followRedirects the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder followRedirects(String followRedirects) {
-            doSetProperty("followRedirects", followRedirects);
-            return this;
-        }
-        /**
-         * Sets password for basic auth plugin enabled servers.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Sets username for basic auth plugin enabled servers.
-         * 
-         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
-         * 
-         * Group: security
-         * 
-         * @param username the value to set
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder username(String username) {
-            doSetProperty("username", username);
-            return this;
-        }
-    }
-
-    /**
-     * Advanced builder for endpoint for the Solr component.
-     */
-    public interface AdvancedSolrEndpointBuilder
-            extends
-                EndpointProducerBuilder {
-        default SolrEndpointBuilder basic() {
-            return (SolrEndpointBuilder) this;
-        }
-        /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
-         * 
-         * Default: false
-         * Group: producer (advanced)
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSolrEndpointBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
-         * type.
-         * 
-         * Default: false
-         * Group: producer (advanced)
-         * 
-         * @param lazyStartProducer the value to set
-         * @return the dsl builder
-         */
-        default AdvancedSolrEndpointBuilder lazyStartProducer(
-                String lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-    }
-
-    public interface SolrBuilders {
-        /**
-         * Solr (camel-solr)
-         * Perform operations against Apache Lucene Solr.
-         * 
-         * Category: monitoring,search
-         * Since: 2.9
-         * Maven coordinates: org.apache.camel:camel-solr
-         * 
-         * @return the dsl builder for the headers' name.
-         */
-        default SolrHeaderNameBuilder solr() {
-            return SolrHeaderNameBuilder.INSTANCE;
-        }
-        /**
-         * Solr (camel-solr)
-         * Perform operations against Apache Lucene Solr.
-         * 
-         * Category: monitoring,search
-         * Since: 2.9
-         * Maven coordinates: org.apache.camel:camel-solr
-         * 
-         * Syntax: <code>solr:url</code>
-         * 
-         * Path parameter: url (required)
-         * Hostname and port for the Solr server(s). Multiple hosts can be
-         * specified, separated with a comma. See the solrClient parameter for
-         * more information on the SolrClient used to connect to Solr.
-         * 
-         * @param path url
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solr(String path) {
-            return SolrEndpointBuilderFactory.endpointBuilder("solr", path);
-        }
-        /**
-         * Solr (camel-solr)
-         * Perform operations against Apache Lucene Solr.
-         * 
-         * Category: monitoring,search
-         * Since: 2.9
-         * Maven coordinates: org.apache.camel:camel-solr
-         * 
-         * Syntax: <code>solr:url</code>
-         * 
-         * Path parameter: url (required)
-         * Hostname and port for the Solr server(s). Multiple hosts can be
-         * specified, separated with a comma. See the solrClient parameter for
-         * more information on the SolrClient used to connect to Solr.
-         * 
-         * @param componentName to use a custom component name for the endpoint
-         * instead of the default name
-         * @param path url
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solr(String componentName, String path) {
-            return SolrEndpointBuilderFactory.endpointBuilder(componentName, path);
-        }
-        /**
-         * Solr (Secure) (camel-solr)
-         * Perform operations against Apache Lucene Solr.
-         * 
-         * Category: monitoring,search
-         * Since: 2.9
-         * Maven coordinates: org.apache.camel:camel-solr
-         * 
-         * Syntax: <code>solrs:url</code>
-         * 
-         * Path parameter: url (required)
-         * Hostname and port for the Solr server(s). Multiple hosts can be
-         * specified, separated with a comma. See the solrClient parameter for
-         * more information on the SolrClient used to connect to Solr.
-         * 
-         * @param path url
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solrs(String path) {
-            return SolrEndpointBuilderFactory.endpointBuilder("solrs", path);
-        }
-        /**
-         * Solr (camel-solr)
-         * Perform operations against Apache Lucene Solr.
-         * 
-         * Category: monitoring,search
-         * Since: 2.9
-         * Maven coordinates: org.apache.camel:camel-solr
-         * 
-         * Syntax: <code>solrCloud:url</code>
-         * 
-         * Path parameter: url (required)
-         * Hostname and port for the Solr server(s). Multiple hosts can be
-         * specified, separated with a comma. See the solrClient parameter for
-         * more information on the SolrClient used to connect to Solr.
-         * 
-         * @param path url
-         * @return the dsl builder
-         */
-        default SolrEndpointBuilder solrCloud(String path) {
-            return SolrEndpointBuilderFactory.endpointBuilder("solrCloud", path);
-        }
-    }
-
-    /**
-     * The builder of headers' name for the Solr component.
-     */
-    public static class SolrHeaderNameBuilder {
-        /**
-         * The internal instance of the builder used to access to all the
-         * methods representing the name of headers.
-         */
-        private static final SolrHeaderNameBuilder INSTANCE = new SolrHeaderNameBuilder();
-
-        /**
-         * The client.
-         * 
-         * The option is a: {@code org.apache.solr.client.solrj.SolrClient}
-         * type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code SolrClient}.
-         */
-        public String solrClient() {
-            return "SolrClient";
-        }
-
-        /**
-         * The collection to execute the request again.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code SolrCollection}.
-         */
-        public String solrCollection() {
-            return "SolrCollection";
-        }
-
-        /**
-         * The operation to perform.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code SolrOperation}.
-         */
-        public String solrOperation() {
-            return "SolrOperation";
-        }
-
-        /**
-         * The query to execute.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code SolrQueryString}.
-         */
-        public String solrQueryString() {
-            return "SolrQueryString";
-        }
-
-        /**
-         * The content type.
-         * 
-         * The option is a: {@code String} type.
-         * 
-         * Group: producer
-         * 
-         * @return the name of the header {@code Content-Type}.
-         */
-        public String contentType() {
-            return "Content-Type";
-        }
-    }
-    static SolrEndpointBuilder endpointBuilder(String componentName, String path) {
-        class SolrEndpointBuilderImpl extends AbstractEndpointBuilder implements SolrEndpointBuilder, AdvancedSolrEndpointBuilder {
-            public SolrEndpointBuilderImpl(String path) {
-                super(componentName, path);
-            }
-        }
-        return new SolrEndpointBuilderImpl(path);
-    }
-}
\ No newline at end of file
diff --git a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
index c5bd8096c24..5559f3c8679 100644
--- a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
+++ b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
@@ -279,7 +279,6 @@ org.apache.camel.component.sjms2.Sjms2Component=camel:sjms2
 org.apache.camel.component.slack.SlackComponent=camel:slack
 org.apache.camel.component.smpp.SmppComponent=camel:smpp
 org.apache.camel.component.snmp.SnmpComponent=camel:snmp
-org.apache.camel.component.solr.SolrComponent=camel:solr
 org.apache.camel.component.splunk.SplunkComponent=camel:splunk
 org.apache.camel.component.splunkhec.SplunkHECComponent=camel:splunk-hec
 org.apache.camel.component.spring.batch.SpringBatchComponent=camel:spring-batch