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

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


The following commit(s) were added to refs/heads/main by this push:
     new f58118f0f3e Regen
f58118f0f3e is described below

commit f58118f0f3e0fc788ca37c9024e2a8f7f2192c8c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Mar 17 16:55:10 2023 +0100

    Regen
---
 .../org/apache/camel/catalog/components/http.json  |  27 +++--
 .../org/apache/camel/catalog/components/https.json |  27 +++--
 .../apache/camel/catalog/components/weather.json   |   2 +-
 .../apache/camel/catalog/components/workday.json   |   2 +-
 .../component/ComponentsBuilderFactory.java        |   4 +-
 .../component/dsl/HttpComponentBuilderFactory.java | 127 +++++++++++++--------
 .../dsl/HttpsComponentBuilderFactory.java          | 127 +++++++++++++--------
 .../src/generated/resources/metadata.json          |   4 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |   4 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  81 +++++++++----
 .../dsl/WeatherEndpointBuilderFactory.java         |  18 +--
 .../dsl/WorkdayEndpointBuilderFactory.java         |   6 +-
 12 files changed, 275 insertions(+), 154 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
index 08d93e198b7..2cf9827c77e 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
@@ -3,7 +3,7 @@
     "kind": "component",
     "name": "http",
     "title": "HTTP",
-    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 4.x.",
+    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 5.x.",
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.3.0",
@@ -27,7 +27,7 @@
   "componentProperties": {
     "followRedirects": { "kind": "property", "displayName": "Follow 
Redirects", "group": "producer", "label": "producer", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether to the 
HTTP request should follow redirects. By default the HTTP request does not 
follow redirects" },
     "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 [...]
-    "cookieStore": { "kind": "property", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": "org.apache.http.client.CookieStore", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom org.apache.http.client.CookieStore. By default the 
org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then t [...]
+    "cookieStore": { "kind": "property", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.cookie.CookieStore", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
org.apache.hc.client5.http.cookie.CookieStore. By default the 
org.apache.hc.client5.http.cookie.BasicCookieStore is used which is an 
in-memory only cookie store. Notice i [...]
     "copyHeaders": { "kind": "property", "displayName": "Copy Headers", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": "If 
this option is true then IN exchange headers will be copied to OUT exchange 
headers according to copy strategy. Setting this to false, allows to only 
include the headers from the HTTP response (not  [...]
     "responsePayloadStreamingThreshold": { "kind": "property", "displayName": 
"Response Payload Streaming Threshold", "group": "producer (advanced)", 
"label": "producer,advanced", "required": false, "type": "integer", "javaType": 
"int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": 8192, "description": "This threshold in bytes controls whether 
the response payload should be stored in memory as a byte array or be streaming 
based. Set this to -1 to always use st [...]
     "skipRequestHeaders": { "kind": "property", "displayName": "Skip Request 
Headers", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether to skip mapping all the Camel headers as HTTP request 
headers. If there are no data from Camel headers needed to be included in the 
HTTP request then this can avoid parsing over [...]
@@ -36,7 +36,7 @@
     "authCachingDisabled": { "kind": "property", "displayName": "Auth Caching 
Disabled", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Disables authentication 
scheme caching" },
     "automaticRetriesDisabled": { "kind": "property", "displayName": 
"Automatic Retries Disabled", "group": "advanced", "label": "advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Disables automatic request recovery and re-execution" },
     "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 [...]
-    "clientConnectionManager": { "kind": "property", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom and shared 
HttpClientConnectionManager to manage connections. If this has been configured 
then this is always used for all endpoints created by this component." },
+    "clientConnectionManager": { "kind": "property", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.io.HttpClientConnectionManager", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom and 
shared HttpClientConnectionManager to manage connections. If this has been 
configured then this is always used for all endpoints created by this comp [...]
     "connectionsPerRoute": { "kind": "property", "displayName": "Connections 
Per Route", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 20, "description": "The maximum number of 
connections per route." },
     "connectionStateDisabled": { "kind": "property", "displayName": 
"Connection State Disabled", "group": "advanced", "label": "advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Disables connection state tracking" },
     "connectionTimeToLive": { "kind": "property", "displayName": "Connection 
Time To Live", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "long", "deprecated": false, "autowired": false, 
"secret": false, "description": "The time for connection to live, the time unit 
is millisecond, the default value is always keep alive." },
@@ -46,7 +46,7 @@
     "httpBinding": { "kind": "property", "displayName": "Http Binding", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpBinding to control the mapping between Camel message and HttpClient." },
     "httpClientConfigurer": { "kind": "property", "displayName": "Http Client 
Configurer", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use the custom 
HttpClientConfigurer to perform configuration of the HttpClient that will be 
used." },
     "httpConfiguration": { "kind": "property", "displayName": "Http 
Configuration", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": "org.apache.camel.http.common.HttpConfiguration", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use the shared HttpConfiguration as base configuration." },
-    "httpContext": { "kind": "property", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
org.apache.http.protocol.HttpContext when executing requests." },
+    "httpContext": { "kind": "property", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
org.apache.hc.core5.http.protocol.HttpContext when executing requests." },
     "maxTotalConnections": { "kind": "property", "displayName": "Max Total 
Connections", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 200, "description": "The maximum number of 
connections." },
     "redirectHandlingDisabled": { "kind": "property", "displayName": "Redirect 
Handling Disabled", "group": "advanced", "label": "advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Disables automatic redirect handling" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header 
Filter Strategy", "group": "filter", "label": "filter", "required": false, 
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and 
from Camel message." },
@@ -61,9 +61,11 @@
     "sslContextParameters": { "kind": "property", "displayName": "Ssl Context 
Parameters", "group": "security", "label": "security", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, 
"autowired": false, "secret": false, "description": "To configure security 
using SSLContextParameters. Important: Only one instance of 
org.apache.camel.support.jsse.SSLContextParameters is supported per 
HttpComponent. If you need to us [...]
     "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use 
Global Ssl Context Parameters", "group": "security", "label": "security", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Enable usage of global SSL context parameters." },
     "x509HostnameVerifier": { "kind": "property", "displayName": "X509 
Hostname Verifier", "group": "security", "label": "security", "required": 
false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom X509HostnameVerifier such as DefaultHostnameVerifier or 
NoopHostnameVerifier." },
-    "connectionRequestTimeout": { "kind": "property", "displayName": 
"Connection Request Timeout", "group": "timeout", "label": "timeout", 
"required": false, "type": "integer", "javaType": "int", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": -1, "description": "The 
timeout in milliseconds used when requesting a connection from the connection 
manager. A timeout value of zero is interpreted as an infinite timeout. A 
timeout value of zero is interpreted as an inf [...]
-    "connectTimeout": { "kind": "property", "displayName": "Connect Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "integer", 
"javaType": "int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": -1, "description": "Determines the timeout in milliseconds 
until a connection is established. A timeout value of zero is interpreted as an 
infinite timeout. A timeout value of zero is interpreted as an infinite 
timeout. A negative value is int [...]
-    "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "integer", 
"javaType": "int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": -1, "description": "Defines the socket timeout in milliseconds, 
which is the timeout for waiting for data or, put differently, a maximum period 
inactivity between two consecutive data packets). A timeout value of zero is 
interpreted as an infini [...]
+    "connectionRequestTimeout": { "kind": "property", "displayName": 
"Connection Request Timeout", "group": "timeout", "label": "timeout", 
"required": false, "type": "object", "javaType": 
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "3 minutes", "description": "Returns the 
connection lease request timeout used when requesting a connection from the 
connection manager. A timeout value of zero is interpreted as a disabled time 
[...]
+    "connectTimeout": { "kind": "property", "displayName": "Connect Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "3 minutes", 
"description": "Determines the timeout until a new connection is fully 
established. A timeout value of zero is interpreted as an infinite timeout." },
+    "responseTimeout": { "kind": "property", "displayName": "Response 
Timeout", "group": "timeout", "label": "timeout", "required": false, "type": 
"object", "javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "0", "description": 
"Determines the timeout until arrival of a response from the opposite endpoint. 
A timeout value of zero is interpreted as an infinite timeout. Please note that 
response timeout may be unsupport [...]
+    "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "null (undefined)", 
"description": "Determines the default socket timeout value for I\/O 
operations." },
+    "soTimeout": { "kind": "property", "displayName": "So Timeout", "group": 
"timeout", "label": "timeout", "required": false, "type": "object", "javaType": 
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "3 minutes", "description": "Determines the 
default socket timeout value for blocking I\/O operations." }
   },
   "headers": {
     "Content-Encoding": { "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The HTTP content encoding. Is set on both the IN and OUT 
message to provide a content encoding, such as gzip.", "constantName": 
"org.apache.camel.component.http.HttpConstants#CONTENT_ENCODING" },
@@ -92,7 +94,7 @@
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw 
Exception On Failure", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": 
"Option to disable throwing the HttpOperationFailedException in case of failed 
responses from the remote server. This allows you to get all responses 
regardless of the HTTP status code." },
     "clearExpiredCookies": { "kind": "parameter", "displayName": "Clear 
Expired Cookies", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": true, 
"description": "Whether to clear expired cookies before sending the HTTP 
request. This ensures the cookies store does not keep growing by adding new 
cookies which is newer removed when they are expir [...]
     "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, 
"autowired": false, "secret": false, "description": "Configure a cookie handler 
to maintain a HTTP session" },
-    "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": "org.apache.http.client.CookieStore", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom CookieStore. By default the BasicCookieStore is used which is an 
in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie 
store is forced to be a noop cookie stor [...]
+    "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.cookie.CookieStore", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
CookieStore. By default the BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to 
be a noop  [...]
     "copyHeaders": { "kind": "parameter", "displayName": "Copy Headers", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": "If 
this option is true then IN exchange headers will be copied to OUT exchange 
headers according to copy strategy. Setting this to false, allows to only 
include the headers from the HTTP response (not [...]
     "customHostHeader": { "kind": "parameter", "displayName": "Custom Host 
Header", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use custom host header for producer. When not set in query will be ignored. 
When set will override host header derived from url." },
     "deleteWithBody": { "kind": "parameter", "displayName": "Delete With 
Body", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether the HTTP DELETE should include the message body or not. 
By default HTTP DELETE do not include any HTTP body. However in some rare cases 
users may need to be able to include the message [...]
@@ -104,13 +106,14 @@
     "skipRequestHeaders": { "kind": "parameter", "displayName": "Skip Request 
Headers", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether to skip mapping all the Camel headers as HTTP request 
headers. If there are no data from Camel headers needed to be included in the 
HTTP request then this can avoid parsing ove [...]
     "skipResponseHeaders": { "kind": "parameter", "displayName": "Skip 
Response Headers", "group": "producer (advanced)", "label": 
"producer,advanced", "required": false, "type": "boolean", "javaType": 
"boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether to skip mapping all the HTTP 
response headers to Camel headers. If there are no data needed from HTTP 
headers then this can avoid parsing overhead with many object allocation [...]
     "userAgent": { "kind": "parameter", "displayName": "User Agent", "group": 
"producer (advanced)", "label": "producer,advanced", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "autowired": 
false, "secret": false, "description": "To set a custom HTTP User-Agent request 
header" },
-    "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.impl.client.HttpClientBuilder", "deprecated": 
false, "autowired": false, "secret": false, "description": "Provide access to 
the http client request parameters used on new RequestConfig instances used by 
producers or consumers of this endpoint." },
-    "clientConnectionManager": { "kind": "parameter", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpClientConnectionManager to manage connections" },
+    "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.client5.http.impl.classic.HttpClientBuilder", 
"deprecated": false, "autowired": false, "secret": false, "description": 
"Provide access to the http client request parameters used on new RequestConfig 
instances used by producers or consumers of this endpoint." },
+    "clientConnectionManager": { "kind": "parameter", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.io.HttpClientConnectionManager", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
HttpClientConnectionManager to manage connections" },
     "connectionsPerRoute": { "kind": "parameter", "displayName": "Connections 
Per Route", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 20, "description": "The maximum number of 
connections per route." },
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.client.HttpClient", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets a custom HttpClient 
to be used by the producer" },
+    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.client5.http.classic.HttpClient", "deprecated": 
false, "autowired": false, "secret": false, "description": "Sets a custom 
HttpClient to be used by the producer" },
     "httpClientConfigurer": { "kind": "parameter", "displayName": "Http Client 
Configurer", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Register a custom 
configuration strategy for new HttpClient instances created by producers or 
consumers such as to configure authentication mechanisms etc." },
     "httpClientOptions": { "kind": "parameter", "displayName": "Http Client 
Options", "group": "advanced", "label": "advanced", "required": false, "type": 
"object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", 
"prefix": "httpClient.", "multiValue": true, "deprecated": false, "autowired": 
false, "secret": false, "description": "To configure the HttpClient using the 
key\/values from the Map." },
-    "httpContext": { "kind": "parameter", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpContext instance" },
+    "httpConnectionOptions": { "kind": "parameter", "displayName": "Http 
Connection Options", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": "java.util.Map<java.lang.String, 
java.lang.Object>", "prefix": "httpConnection.", "multiValue": true, 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
configure the connection and the socket using the key\/values from the Map." },
+    "httpContext": { "kind": "parameter", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
HttpContext instance" },
     "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total 
Connections", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 200, "description": "The maximum number of 
connections." },
     "useSystemProperties": { "kind": "parameter", "displayName": "Use System 
Properties", "group": "advanced", "label": "advanced", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "To use System 
Properties as fallback for configuration" },
     "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth 
Domain", "group": "proxy", "label": "producer,proxy", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Proxy authentication 
domain to use with NTML" },
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
index 6974e979e64..36e3597ad93 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
@@ -3,7 +3,7 @@
     "kind": "component",
     "name": "https",
     "title": "HTTPS (Secure)",
-    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 4.x.",
+    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 5.x.",
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.3.0",
@@ -27,7 +27,7 @@
   "componentProperties": {
     "followRedirects": { "kind": "property", "displayName": "Follow 
Redirects", "group": "producer", "label": "producer", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether to the 
HTTP request should follow redirects. By default the HTTP request does not 
follow redirects" },
     "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 [...]
-    "cookieStore": { "kind": "property", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": "org.apache.http.client.CookieStore", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom org.apache.http.client.CookieStore. By default the 
org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then t [...]
+    "cookieStore": { "kind": "property", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.cookie.CookieStore", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
org.apache.hc.client5.http.cookie.CookieStore. By default the 
org.apache.hc.client5.http.cookie.BasicCookieStore is used which is an 
in-memory only cookie store. Notice i [...]
     "copyHeaders": { "kind": "property", "displayName": "Copy Headers", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": "If 
this option is true then IN exchange headers will be copied to OUT exchange 
headers according to copy strategy. Setting this to false, allows to only 
include the headers from the HTTP response (not  [...]
     "responsePayloadStreamingThreshold": { "kind": "property", "displayName": 
"Response Payload Streaming Threshold", "group": "producer (advanced)", 
"label": "producer,advanced", "required": false, "type": "integer", "javaType": 
"int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": 8192, "description": "This threshold in bytes controls whether 
the response payload should be stored in memory as a byte array or be streaming 
based. Set this to -1 to always use st [...]
     "skipRequestHeaders": { "kind": "property", "displayName": "Skip Request 
Headers", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether to skip mapping all the Camel headers as HTTP request 
headers. If there are no data from Camel headers needed to be included in the 
HTTP request then this can avoid parsing over [...]
@@ -36,7 +36,7 @@
     "authCachingDisabled": { "kind": "property", "displayName": "Auth Caching 
Disabled", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Disables authentication 
scheme caching" },
     "automaticRetriesDisabled": { "kind": "property", "displayName": 
"Automatic Retries Disabled", "group": "advanced", "label": "advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Disables automatic request recovery and re-execution" },
     "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 [...]
-    "clientConnectionManager": { "kind": "property", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom and shared 
HttpClientConnectionManager to manage connections. If this has been configured 
then this is always used for all endpoints created by this component." },
+    "clientConnectionManager": { "kind": "property", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.io.HttpClientConnectionManager", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom and 
shared HttpClientConnectionManager to manage connections. If this has been 
configured then this is always used for all endpoints created by this comp [...]
     "connectionsPerRoute": { "kind": "property", "displayName": "Connections 
Per Route", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 20, "description": "The maximum number of 
connections per route." },
     "connectionStateDisabled": { "kind": "property", "displayName": 
"Connection State Disabled", "group": "advanced", "label": "advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Disables connection state tracking" },
     "connectionTimeToLive": { "kind": "property", "displayName": "Connection 
Time To Live", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "long", "deprecated": false, "autowired": false, 
"secret": false, "description": "The time for connection to live, the time unit 
is millisecond, the default value is always keep alive." },
@@ -46,7 +46,7 @@
     "httpBinding": { "kind": "property", "displayName": "Http Binding", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpBinding to control the mapping between Camel message and HttpClient." },
     "httpClientConfigurer": { "kind": "property", "displayName": "Http Client 
Configurer", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use the custom 
HttpClientConfigurer to perform configuration of the HttpClient that will be 
used." },
     "httpConfiguration": { "kind": "property", "displayName": "Http 
Configuration", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": "org.apache.camel.http.common.HttpConfiguration", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use the shared HttpConfiguration as base configuration." },
-    "httpContext": { "kind": "property", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
org.apache.http.protocol.HttpContext when executing requests." },
+    "httpContext": { "kind": "property", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
org.apache.hc.core5.http.protocol.HttpContext when executing requests." },
     "maxTotalConnections": { "kind": "property", "displayName": "Max Total 
Connections", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 200, "description": "The maximum number of 
connections." },
     "redirectHandlingDisabled": { "kind": "property", "displayName": "Redirect 
Handling Disabled", "group": "advanced", "label": "advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Disables automatic redirect handling" },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header 
Filter Strategy", "group": "filter", "label": "filter", "required": false, 
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and 
from Camel message." },
@@ -61,9 +61,11 @@
     "sslContextParameters": { "kind": "property", "displayName": "Ssl Context 
Parameters", "group": "security", "label": "security", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, 
"autowired": false, "secret": false, "description": "To configure security 
using SSLContextParameters. Important: Only one instance of 
org.apache.camel.support.jsse.SSLContextParameters is supported per 
HttpComponent. If you need to us [...]
     "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use 
Global Ssl Context Parameters", "group": "security", "label": "security", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Enable usage of global SSL context parameters." },
     "x509HostnameVerifier": { "kind": "property", "displayName": "X509 
Hostname Verifier", "group": "security", "label": "security", "required": 
false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom X509HostnameVerifier such as DefaultHostnameVerifier or 
NoopHostnameVerifier." },
-    "connectionRequestTimeout": { "kind": "property", "displayName": 
"Connection Request Timeout", "group": "timeout", "label": "timeout", 
"required": false, "type": "integer", "javaType": "int", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": -1, "description": "The 
timeout in milliseconds used when requesting a connection from the connection 
manager. A timeout value of zero is interpreted as an infinite timeout. A 
timeout value of zero is interpreted as an inf [...]
-    "connectTimeout": { "kind": "property", "displayName": "Connect Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "integer", 
"javaType": "int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": -1, "description": "Determines the timeout in milliseconds 
until a connection is established. A timeout value of zero is interpreted as an 
infinite timeout. A timeout value of zero is interpreted as an infinite 
timeout. A negative value is int [...]
-    "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "integer", 
"javaType": "int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": -1, "description": "Defines the socket timeout in milliseconds, 
which is the timeout for waiting for data or, put differently, a maximum period 
inactivity between two consecutive data packets). A timeout value of zero is 
interpreted as an infini [...]
+    "connectionRequestTimeout": { "kind": "property", "displayName": 
"Connection Request Timeout", "group": "timeout", "label": "timeout", 
"required": false, "type": "object", "javaType": 
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "3 minutes", "description": "Returns the 
connection lease request timeout used when requesting a connection from the 
connection manager. A timeout value of zero is interpreted as a disabled time 
[...]
+    "connectTimeout": { "kind": "property", "displayName": "Connect Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "3 minutes", 
"description": "Determines the timeout until a new connection is fully 
established. A timeout value of zero is interpreted as an infinite timeout." },
+    "responseTimeout": { "kind": "property", "displayName": "Response 
Timeout", "group": "timeout", "label": "timeout", "required": false, "type": 
"object", "javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "0", "description": 
"Determines the timeout until arrival of a response from the opposite endpoint. 
A timeout value of zero is interpreted as an infinite timeout. Please note that 
response timeout may be unsupport [...]
+    "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", 
"group": "timeout", "label": "timeout", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "null (undefined)", 
"description": "Determines the default socket timeout value for I\/O 
operations." },
+    "soTimeout": { "kind": "property", "displayName": "So Timeout", "group": 
"timeout", "label": "timeout", "required": false, "type": "object", "javaType": 
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "3 minutes", "description": "Determines the 
default socket timeout value for blocking I\/O operations." }
   },
   "headers": {
     "Content-Encoding": { "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The HTTP content encoding. Is set on both the IN and OUT 
message to provide a content encoding, such as gzip.", "constantName": 
"org.apache.camel.component.http.HttpConstants#CONTENT_ENCODING" },
@@ -92,7 +94,7 @@
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw 
Exception On Failure", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": 
"Option to disable throwing the HttpOperationFailedException in case of failed 
responses from the remote server. This allows you to get all responses 
regardless of the HTTP status code." },
     "clearExpiredCookies": { "kind": "parameter", "displayName": "Clear 
Expired Cookies", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": true, 
"description": "Whether to clear expired cookies before sending the HTTP 
request. This ensures the cookies store does not keep growing by adding new 
cookies which is newer removed when they are expir [...]
     "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, 
"autowired": false, "secret": false, "description": "Configure a cookie handler 
to maintain a HTTP session" },
-    "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": "org.apache.http.client.CookieStore", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use a custom CookieStore. By default the BasicCookieStore is used which is an 
in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie 
store is forced to be a noop cookie stor [...]
+    "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.cookie.CookieStore", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
CookieStore. By default the BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to 
be a noop  [...]
     "copyHeaders": { "kind": "parameter", "displayName": "Copy Headers", 
"group": "producer (advanced)", "label": "producer,advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": "If 
this option is true then IN exchange headers will be copied to OUT exchange 
headers according to copy strategy. Setting this to false, allows to only 
include the headers from the HTTP response (not [...]
     "customHostHeader": { "kind": "parameter", "displayName": "Custom Host 
Header", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
use custom host header for producer. When not set in query will be ignored. 
When set will override host header derived from url." },
     "deleteWithBody": { "kind": "parameter", "displayName": "Delete With 
Body", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether the HTTP DELETE should include the message body or not. 
By default HTTP DELETE do not include any HTTP body. However in some rare cases 
users may need to be able to include the message [...]
@@ -104,13 +106,14 @@
     "skipRequestHeaders": { "kind": "parameter", "displayName": "Skip Request 
Headers", "group": "producer (advanced)", "label": "producer,advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "autowired": false, "secret": false, "defaultValue": false, 
"description": "Whether to skip mapping all the Camel headers as HTTP request 
headers. If there are no data from Camel headers needed to be included in the 
HTTP request then this can avoid parsing ove [...]
     "skipResponseHeaders": { "kind": "parameter", "displayName": "Skip 
Response Headers", "group": "producer (advanced)", "label": 
"producer,advanced", "required": false, "type": "boolean", "javaType": 
"boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether to skip mapping all the HTTP 
response headers to Camel headers. If there are no data needed from HTTP 
headers then this can avoid parsing overhead with many object allocation [...]
     "userAgent": { "kind": "parameter", "displayName": "User Agent", "group": 
"producer (advanced)", "label": "producer,advanced", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "autowired": 
false, "secret": false, "description": "To set a custom HTTP User-Agent request 
header" },
-    "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.impl.client.HttpClientBuilder", "deprecated": 
false, "autowired": false, "secret": false, "description": "Provide access to 
the http client request parameters used on new RequestConfig instances used by 
producers or consumers of this endpoint." },
-    "clientConnectionManager": { "kind": "parameter", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpClientConnectionManager to manage connections" },
+    "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.client5.http.impl.classic.HttpClientBuilder", 
"deprecated": false, "autowired": false, "secret": false, "description": 
"Provide access to the http client request parameters used on new RequestConfig 
instances used by producers or consumers of this endpoint." },
+    "clientConnectionManager": { "kind": "parameter", "displayName": "Client 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.io.HttpClientConnectionManager", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
HttpClientConnectionManager to manage connections" },
     "connectionsPerRoute": { "kind": "parameter", "displayName": "Connections 
Per Route", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 20, "description": "The maximum number of 
connections per route." },
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.client.HttpClient", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets a custom HttpClient 
to be used by the producer" },
+    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.client5.http.classic.HttpClient", "deprecated": 
false, "autowired": false, "secret": false, "description": "Sets a custom 
HttpClient to be used by the producer" },
     "httpClientConfigurer": { "kind": "parameter", "displayName": "Http Client 
Configurer", "group": "advanced", "label": "advanced", "required": false, 
"type": "object", "javaType": 
"org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Register a custom 
configuration strategy for new HttpClient instances created by producers or 
consumers such as to configure authentication mechanisms etc." },
     "httpClientOptions": { "kind": "parameter", "displayName": "Http Client 
Options", "group": "advanced", "label": "advanced", "required": false, "type": 
"object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", 
"prefix": "httpClient.", "multiValue": true, "deprecated": false, "autowired": 
false, "secret": false, "description": "To configure the HttpClient using the 
key\/values from the Map." },
-    "httpContext": { "kind": "parameter", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a custom 
HttpContext instance" },
+    "httpConnectionOptions": { "kind": "parameter", "displayName": "Http 
Connection Options", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": "java.util.Map<java.lang.String, 
java.lang.Object>", "prefix": "httpConnection.", "multiValue": true, 
"deprecated": false, "autowired": false, "secret": false, "description": "To 
configure the connection and the socket using the key\/values from the Map." },
+    "httpContext": { "kind": "parameter", "displayName": "Http Context", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": 
false, "autowired": false, "secret": false, "description": "To use a custom 
HttpContext instance" },
     "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total 
Connections", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 200, "description": "The maximum number of 
connections." },
     "useSystemProperties": { "kind": "parameter", "displayName": "Use System 
Properties", "group": "advanced", "label": "advanced", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "To use System 
Properties as fallback for configuration" },
     "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth 
Domain", "group": "proxy", "label": "producer,proxy", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Proxy authentication 
domain to use with NTML" },
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
index b0172ed7151..d0864797e1b 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
@@ -46,7 +46,7 @@
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", 
"group": "consumer (advanced)", "label": "consumer,advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, 
"autowired": false, "secret": false, "description": "A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation  [...]
     "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 [...]
     "geoLocationProvider": { "kind": "parameter", "displayName": "Geo Location 
Provider", "group": "advanced", "label": "advanced", "required": false, "type": 
"object", "javaType": 
"org.apache.camel.component.weather.geolocation.GeoLocationProvider", 
"deprecated": false, "autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "A custum geolocation 
provider to determine the  [...]
-    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.http.impl.client.CloseableHttpClient", "deprecated": 
false, "autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "To use an existing 
configured http client (for example with http proxy)" },
+    "httpClient": { "kind": "parameter", "displayName": "Http Client", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.hc.client5.http.impl.classic.CloseableHttpClient", 
"deprecated": false, "autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "To use an existing 
configured http client (for example with http proxy)" },
     "cnt": { "kind": "parameter", "displayName": "Cnt", "group": "filter", 
"label": "filter", "required": false, "type": "integer", "javaType": 
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, 
"configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "Number of results to be 
found" },
     "ids": { "kind": "parameter", "displayName": "Ids", "group": "filter", 
"label": "filter", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "List of id's of 
city\/stations. You can separate multiple ids by comma." },
     "lat": { "kind": "parameter", "displayName": "Lat", "group": "filter", 
"label": "filter", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"configurationClass": 
"org.apache.camel.component.weather.WeatherConfiguration", 
"configurationField": "configuration", "description": "Latitude of location. 
You can use lat and lon options instead of location. For boxed queries this is 
the bottom latitude." },
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
index 3898e573953..2ba60b9d80a 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
@@ -32,7 +32,7 @@
     "entity": { "kind": "path", "displayName": "Entity", "group": "producer", 
"label": "", "required": true, "type": "object", "javaType": 
"org.apache.camel.component.workday.WorkdayConfiguration.Entity", "enum": [ 
"report", "commonAPI" ], "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "The entity to be 
requested o [...]
     "path": { "kind": "path", "displayName": "Path", "group": "producer", 
"label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "The API path to 
access an entity structure." },
     "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 [...]
-    "httpConnectionManager": { "kind": "parameter", "displayName": "Http 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.http.impl.conn.PoolingHttpClientConnectionManager", "deprecated": 
false, "autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "Pool connection 
manager for advanced confi [...]
+    "httpConnectionManager": { "kind": "parameter", "displayName": "Http 
Connection Manager", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager", 
"deprecated": false, "autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "Pool connection 
manager for advan [...]
     "reportFormat": { "kind": "parameter", "displayName": "Report Format", 
"group": "format", "label": "format", "required": false, "type": "string", 
"javaType": "java.lang.String", "enum": [ "json" ], "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "json", 
"configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "Workday Report as 
a service output format." },
     "host": { "kind": "parameter", "displayName": "Host", "group": "host", 
"label": "host", "required": true, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "Workday Host 
name." },
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": 
"security", "label": "security", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": true, "configurationClass": 
"org.apache.camel.component.workday.WorkdayConfiguration", 
"configurationField": "workdayConfiguration", "description": "Workday client Id 
generated by API client for integrations." },
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 01c2ff690f2..281f9d03dbf 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
@@ -1795,7 +1795,7 @@ public interface ComponentsBuilderFactory {
     }
     /**
      * HTTP (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
@@ -1808,7 +1808,7 @@ public interface ComponentsBuilderFactory {
     }
     /**
      * HTTPS (Secure) (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
diff --git 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
index 75d1036c200..d79ca5cd7f5 100644
--- 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
+++ 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
 import org.apache.camel.component.http.HttpComponent;
 
 /**
- * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+ * Send requests to external HTTP servers using Apache HTTP Client 5.x.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -32,7 +32,7 @@ public interface HttpComponentBuilderFactory {
 
     /**
      * HTTP (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
@@ -88,14 +88,15 @@ public interface HttpComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.http.client.CookieStore. By default the
-         * org.apache.http.impl.client.BasicCookieStore is used which is an
-         * in-memory only cookie store. Notice if bridgeEndpoint=true then the
-         * cookie store is forced to be a noop cookie store as cookie shouldn't
-         * be stored as we are just bridging (eg acting as a proxy).
+         * To use a custom org.apache.hc.client5.http.cookie.CookieStore. By
+         * default the org.apache.hc.client5.http.cookie.BasicCookieStore is
+         * used which is an in-memory only cookie store. Notice if
+         * bridgeEndpoint=true then the cookie store is forced to be a noop
+         * cookie store as cookie shouldn't be stored as we are just bridging
+         * (eg acting as a proxy).
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.client.CookieStore&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.cookie.CookieStore&lt;/code&gt; type.
          * 
          * Group: producer (advanced)
          * 
@@ -103,7 +104,7 @@ public interface HttpComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpComponentBuilder cookieStore(
-                org.apache.http.client.CookieStore cookieStore) {
+                org.apache.hc.client5.http.cookie.CookieStore cookieStore) {
             doSetProperty("cookieStore", cookieStore);
             return this;
         }
@@ -259,7 +260,7 @@ public interface HttpComponentBuilderFactory {
          * all endpoints created by this component.
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.conn.HttpClientConnectionManager&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.io.HttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -267,7 +268,7 @@ public interface HttpComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpComponentBuilder clientConnectionManager(
-                org.apache.http.conn.HttpClientConnectionManager 
clientConnectionManager) {
+                org.apache.hc.client5.http.io.HttpClientConnectionManager 
clientConnectionManager) {
             doSetProperty("clientConnectionManager", clientConnectionManager);
             return this;
         }
@@ -419,11 +420,11 @@ public interface HttpComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.http.protocol.HttpContext when executing
-         * requests.
+         * To use a custom org.apache.hc.core5.http.protocol.HttpContext when
+         * executing requests.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.protocol.HttpContext&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.core5.http.protocol.HttpContext&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -431,7 +432,7 @@ public interface HttpComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpComponentBuilder httpContext(
-                org.apache.http.protocol.HttpContext httpContext) {
+                org.apache.hc.core5.http.protocol.HttpContext httpContext) {
             doSetProperty("httpContext", httpContext);
             return this;
         }
@@ -658,63 +659,97 @@ public interface HttpComponentBuilderFactory {
             return this;
         }
         /**
-         * The timeout in milliseconds used when requesting a connection from
-         * the connection manager. A timeout value of zero is interpreted as an
-         * infinite timeout. A timeout value of zero is interpreted as an
-         * infinite timeout. A negative value is interpreted as undefined
-         * (system default).
+         * Returns the connection lease request timeout used when requesting a
+         * connection from the connection manager. A timeout value of zero is
+         * interpreted as a disabled timeout.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: 3 minutes
          * Group: timeout
          * 
          * @param connectionRequestTimeout the value to set
          * @return the dsl builder
          */
         default HttpComponentBuilder connectionRequestTimeout(
-                int connectionRequestTimeout) {
+                org.apache.hc.core5.util.Timeout connectionRequestTimeout) {
             doSetProperty("connectionRequestTimeout", 
connectionRequestTimeout);
             return this;
         }
         /**
-         * Determines the timeout in milliseconds until a connection is
-         * established. A timeout value of zero is interpreted as an infinite
-         * timeout. A timeout value of zero is interpreted as an infinite
-         * timeout. A negative value is interpreted as undefined (system
-         * default).
+         * Determines the timeout until a new connection is fully established. 
A
+         * timeout value of zero is interpreted as an infinite timeout.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: 3 minutes
          * Group: timeout
          * 
          * @param connectTimeout the value to set
          * @return the dsl builder
          */
-        default HttpComponentBuilder connectTimeout(int connectTimeout) {
+        default HttpComponentBuilder connectTimeout(
+                org.apache.hc.core5.util.Timeout connectTimeout) {
             doSetProperty("connectTimeout", connectTimeout);
             return this;
         }
         /**
-         * Defines the socket timeout in milliseconds, which is the timeout for
-         * waiting for data or, put differently, a maximum period inactivity
-         * between two consecutive data packets). A timeout value of zero is
-         * interpreted as an infinite timeout. A negative value is interpreted
-         * as undefined (system default).
+         * Determines the timeout until arrival of a response from the opposite
+         * endpoint. A timeout value of zero is interpreted as an infinite
+         * timeout. Please note that response timeout may be unsupported by 
HTTP
+         * transports with message multiplexing.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
+         * 
+         * Default: 0
+         * Group: timeout
+         * 
+         * @param responseTimeout the value to set
+         * @return the dsl builder
+         */
+        default HttpComponentBuilder responseTimeout(
+                org.apache.hc.core5.util.Timeout responseTimeout) {
+            doSetProperty("responseTimeout", responseTimeout);
+            return this;
+        }
+        /**
+         * Determines the default socket timeout value for I/O operations.
+         * 
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: null (undefined)
          * Group: timeout
          * 
          * @param socketTimeout the value to set
          * @return the dsl builder
          */
-        default HttpComponentBuilder socketTimeout(int socketTimeout) {
+        default HttpComponentBuilder socketTimeout(
+                org.apache.hc.core5.util.Timeout socketTimeout) {
             doSetProperty("socketTimeout", socketTimeout);
             return this;
         }
+        /**
+         * Determines the default socket timeout value for blocking I/O
+         * operations.
+         * 
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
+         * 
+         * Default: 3 minutes
+         * Group: timeout
+         * 
+         * @param soTimeout the value to set
+         * @return the dsl builder
+         */
+        default HttpComponentBuilder soTimeout(
+                org.apache.hc.core5.util.Timeout soTimeout) {
+            doSetProperty("soTimeout", soTimeout);
+            return this;
+        }
     }
 
     class HttpComponentBuilderImpl
@@ -734,7 +769,7 @@ public interface HttpComponentBuilderFactory {
             switch (name) {
             case "followRedirects": ((HttpComponent) 
component).setFollowRedirects((boolean) value); return true;
             case "lazyStartProducer": ((HttpComponent) 
component).setLazyStartProducer((boolean) value); return true;
-            case "cookieStore": ((HttpComponent) 
component).setCookieStore((org.apache.http.client.CookieStore) value); return 
true;
+            case "cookieStore": ((HttpComponent) 
component).setCookieStore((org.apache.hc.client5.http.cookie.CookieStore) 
value); return true;
             case "copyHeaders": ((HttpComponent) 
component).setCopyHeaders((boolean) value); return true;
             case "responsePayloadStreamingThreshold": ((HttpComponent) 
component).setResponsePayloadStreamingThreshold((int) value); return true;
             case "skipRequestHeaders": ((HttpComponent) 
component).setSkipRequestHeaders((boolean) value); return true;
@@ -743,7 +778,7 @@ public interface HttpComponentBuilderFactory {
             case "authCachingDisabled": ((HttpComponent) 
component).setAuthCachingDisabled((boolean) value); return true;
             case "automaticRetriesDisabled": ((HttpComponent) 
component).setAutomaticRetriesDisabled((boolean) value); return true;
             case "autowiredEnabled": ((HttpComponent) 
component).setAutowiredEnabled((boolean) value); return true;
-            case "clientConnectionManager": ((HttpComponent) 
component).setClientConnectionManager((org.apache.http.conn.HttpClientConnectionManager)
 value); return true;
+            case "clientConnectionManager": ((HttpComponent) 
component).setClientConnectionManager((org.apache.hc.client5.http.io.HttpClientConnectionManager)
 value); return true;
             case "connectionsPerRoute": ((HttpComponent) 
component).setConnectionsPerRoute((int) value); return true;
             case "connectionStateDisabled": ((HttpComponent) 
component).setConnectionStateDisabled((boolean) value); return true;
             case "connectionTimeToLive": ((HttpComponent) 
component).setConnectionTimeToLive((long) value); return true;
@@ -753,7 +788,7 @@ public interface HttpComponentBuilderFactory {
             case "httpBinding": ((HttpComponent) 
component).setHttpBinding((org.apache.camel.http.common.HttpBinding) value); 
return true;
             case "httpClientConfigurer": ((HttpComponent) 
component).setHttpClientConfigurer((org.apache.camel.component.http.HttpClientConfigurer)
 value); return true;
             case "httpConfiguration": ((HttpComponent) 
component).setHttpConfiguration((org.apache.camel.http.common.HttpConfiguration)
 value); return true;
-            case "httpContext": ((HttpComponent) 
component).setHttpContext((org.apache.http.protocol.HttpContext) value); return 
true;
+            case "httpContext": ((HttpComponent) 
component).setHttpContext((org.apache.hc.core5.http.protocol.HttpContext) 
value); return true;
             case "maxTotalConnections": ((HttpComponent) 
component).setMaxTotalConnections((int) value); return true;
             case "redirectHandlingDisabled": ((HttpComponent) 
component).setRedirectHandlingDisabled((boolean) value); return true;
             case "headerFilterStrategy": ((HttpComponent) 
component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) 
value); return true;
@@ -768,9 +803,11 @@ public interface HttpComponentBuilderFactory {
             case "sslContextParameters": ((HttpComponent) 
component).setSslContextParameters((org.apache.camel.support.jsse.SSLContextParameters)
 value); return true;
             case "useGlobalSslContextParameters": ((HttpComponent) 
component).setUseGlobalSslContextParameters((boolean) value); return true;
             case "x509HostnameVerifier": ((HttpComponent) 
component).setX509HostnameVerifier((javax.net.ssl.HostnameVerifier) value); 
return true;
-            case "connectionRequestTimeout": ((HttpComponent) 
component).setConnectionRequestTimeout((int) value); return true;
-            case "connectTimeout": ((HttpComponent) 
component).setConnectTimeout((int) value); return true;
-            case "socketTimeout": ((HttpComponent) 
component).setSocketTimeout((int) value); return true;
+            case "connectionRequestTimeout": ((HttpComponent) 
component).setConnectionRequestTimeout((org.apache.hc.core5.util.Timeout) 
value); return true;
+            case "connectTimeout": ((HttpComponent) 
component).setConnectTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "responseTimeout": ((HttpComponent) 
component).setResponseTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "socketTimeout": ((HttpComponent) 
component).setSocketTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "soTimeout": ((HttpComponent) 
component).setSoTimeout((org.apache.hc.core5.util.Timeout) value); return true;
             default: return false;
             }
         }
diff --git 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
index 016d5b78345..bc46e7362e4 100644
--- 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
+++ 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
 import org.apache.camel.component.http.HttpComponent;
 
 /**
- * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+ * Send requests to external HTTP servers using Apache HTTP Client 5.x.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -32,7 +32,7 @@ public interface HttpsComponentBuilderFactory {
 
     /**
      * HTTPS (Secure) (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
@@ -89,14 +89,15 @@ public interface HttpsComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.http.client.CookieStore. By default the
-         * org.apache.http.impl.client.BasicCookieStore is used which is an
-         * in-memory only cookie store. Notice if bridgeEndpoint=true then the
-         * cookie store is forced to be a noop cookie store as cookie shouldn't
-         * be stored as we are just bridging (eg acting as a proxy).
+         * To use a custom org.apache.hc.client5.http.cookie.CookieStore. By
+         * default the org.apache.hc.client5.http.cookie.BasicCookieStore is
+         * used which is an in-memory only cookie store. Notice if
+         * bridgeEndpoint=true then the cookie store is forced to be a noop
+         * cookie store as cookie shouldn't be stored as we are just bridging
+         * (eg acting as a proxy).
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.client.CookieStore&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.cookie.CookieStore&lt;/code&gt; type.
          * 
          * Group: producer (advanced)
          * 
@@ -104,7 +105,7 @@ public interface HttpsComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpsComponentBuilder cookieStore(
-                org.apache.http.client.CookieStore cookieStore) {
+                org.apache.hc.client5.http.cookie.CookieStore cookieStore) {
             doSetProperty("cookieStore", cookieStore);
             return this;
         }
@@ -260,7 +261,7 @@ public interface HttpsComponentBuilderFactory {
          * all endpoints created by this component.
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.conn.HttpClientConnectionManager&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.io.HttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -268,7 +269,7 @@ public interface HttpsComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpsComponentBuilder clientConnectionManager(
-                org.apache.http.conn.HttpClientConnectionManager 
clientConnectionManager) {
+                org.apache.hc.client5.http.io.HttpClientConnectionManager 
clientConnectionManager) {
             doSetProperty("clientConnectionManager", clientConnectionManager);
             return this;
         }
@@ -421,11 +422,11 @@ public interface HttpsComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.http.protocol.HttpContext when executing
-         * requests.
+         * To use a custom org.apache.hc.core5.http.protocol.HttpContext when
+         * executing requests.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.protocol.HttpContext&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.core5.http.protocol.HttpContext&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -433,7 +434,7 @@ public interface HttpsComponentBuilderFactory {
          * @return the dsl builder
          */
         default HttpsComponentBuilder httpContext(
-                org.apache.http.protocol.HttpContext httpContext) {
+                org.apache.hc.core5.http.protocol.HttpContext httpContext) {
             doSetProperty("httpContext", httpContext);
             return this;
         }
@@ -661,63 +662,97 @@ public interface HttpsComponentBuilderFactory {
             return this;
         }
         /**
-         * The timeout in milliseconds used when requesting a connection from
-         * the connection manager. A timeout value of zero is interpreted as an
-         * infinite timeout. A timeout value of zero is interpreted as an
-         * infinite timeout. A negative value is interpreted as undefined
-         * (system default).
+         * Returns the connection lease request timeout used when requesting a
+         * connection from the connection manager. A timeout value of zero is
+         * interpreted as a disabled timeout.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: 3 minutes
          * Group: timeout
          * 
          * @param connectionRequestTimeout the value to set
          * @return the dsl builder
          */
         default HttpsComponentBuilder connectionRequestTimeout(
-                int connectionRequestTimeout) {
+                org.apache.hc.core5.util.Timeout connectionRequestTimeout) {
             doSetProperty("connectionRequestTimeout", 
connectionRequestTimeout);
             return this;
         }
         /**
-         * Determines the timeout in milliseconds until a connection is
-         * established. A timeout value of zero is interpreted as an infinite
-         * timeout. A timeout value of zero is interpreted as an infinite
-         * timeout. A negative value is interpreted as undefined (system
-         * default).
+         * Determines the timeout until a new connection is fully established. 
A
+         * timeout value of zero is interpreted as an infinite timeout.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: 3 minutes
          * Group: timeout
          * 
          * @param connectTimeout the value to set
          * @return the dsl builder
          */
-        default HttpsComponentBuilder connectTimeout(int connectTimeout) {
+        default HttpsComponentBuilder connectTimeout(
+                org.apache.hc.core5.util.Timeout connectTimeout) {
             doSetProperty("connectTimeout", connectTimeout);
             return this;
         }
         /**
-         * Defines the socket timeout in milliseconds, which is the timeout for
-         * waiting for data or, put differently, a maximum period inactivity
-         * between two consecutive data packets). A timeout value of zero is
-         * interpreted as an infinite timeout. A negative value is interpreted
-         * as undefined (system default).
+         * Determines the timeout until arrival of a response from the opposite
+         * endpoint. A timeout value of zero is interpreted as an infinite
+         * timeout. Please note that response timeout may be unsupported by 
HTTP
+         * transports with message multiplexing.
          * 
-         * The option is a: &lt;code&gt;int&lt;/code&gt; type.
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
+         * 
+         * Default: 0
+         * Group: timeout
+         * 
+         * @param responseTimeout the value to set
+         * @return the dsl builder
+         */
+        default HttpsComponentBuilder responseTimeout(
+                org.apache.hc.core5.util.Timeout responseTimeout) {
+            doSetProperty("responseTimeout", responseTimeout);
+            return this;
+        }
+        /**
+         * Determines the default socket timeout value for I/O operations.
+         * 
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
          * 
-         * Default: -1
+         * Default: null (undefined)
          * Group: timeout
          * 
          * @param socketTimeout the value to set
          * @return the dsl builder
          */
-        default HttpsComponentBuilder socketTimeout(int socketTimeout) {
+        default HttpsComponentBuilder socketTimeout(
+                org.apache.hc.core5.util.Timeout socketTimeout) {
             doSetProperty("socketTimeout", socketTimeout);
             return this;
         }
+        /**
+         * Determines the default socket timeout value for blocking I/O
+         * operations.
+         * 
+         * The option is a:
+         * &lt;code&gt;org.apache.hc.core5.util.Timeout&lt;/code&gt; type.
+         * 
+         * Default: 3 minutes
+         * Group: timeout
+         * 
+         * @param soTimeout the value to set
+         * @return the dsl builder
+         */
+        default HttpsComponentBuilder soTimeout(
+                org.apache.hc.core5.util.Timeout soTimeout) {
+            doSetProperty("soTimeout", soTimeout);
+            return this;
+        }
     }
 
     class HttpsComponentBuilderImpl
@@ -737,7 +772,7 @@ public interface HttpsComponentBuilderFactory {
             switch (name) {
             case "followRedirects": ((HttpComponent) 
component).setFollowRedirects((boolean) value); return true;
             case "lazyStartProducer": ((HttpComponent) 
component).setLazyStartProducer((boolean) value); return true;
-            case "cookieStore": ((HttpComponent) 
component).setCookieStore((org.apache.http.client.CookieStore) value); return 
true;
+            case "cookieStore": ((HttpComponent) 
component).setCookieStore((org.apache.hc.client5.http.cookie.CookieStore) 
value); return true;
             case "copyHeaders": ((HttpComponent) 
component).setCopyHeaders((boolean) value); return true;
             case "responsePayloadStreamingThreshold": ((HttpComponent) 
component).setResponsePayloadStreamingThreshold((int) value); return true;
             case "skipRequestHeaders": ((HttpComponent) 
component).setSkipRequestHeaders((boolean) value); return true;
@@ -746,7 +781,7 @@ public interface HttpsComponentBuilderFactory {
             case "authCachingDisabled": ((HttpComponent) 
component).setAuthCachingDisabled((boolean) value); return true;
             case "automaticRetriesDisabled": ((HttpComponent) 
component).setAutomaticRetriesDisabled((boolean) value); return true;
             case "autowiredEnabled": ((HttpComponent) 
component).setAutowiredEnabled((boolean) value); return true;
-            case "clientConnectionManager": ((HttpComponent) 
component).setClientConnectionManager((org.apache.http.conn.HttpClientConnectionManager)
 value); return true;
+            case "clientConnectionManager": ((HttpComponent) 
component).setClientConnectionManager((org.apache.hc.client5.http.io.HttpClientConnectionManager)
 value); return true;
             case "connectionsPerRoute": ((HttpComponent) 
component).setConnectionsPerRoute((int) value); return true;
             case "connectionStateDisabled": ((HttpComponent) 
component).setConnectionStateDisabled((boolean) value); return true;
             case "connectionTimeToLive": ((HttpComponent) 
component).setConnectionTimeToLive((long) value); return true;
@@ -756,7 +791,7 @@ public interface HttpsComponentBuilderFactory {
             case "httpBinding": ((HttpComponent) 
component).setHttpBinding((org.apache.camel.http.common.HttpBinding) value); 
return true;
             case "httpClientConfigurer": ((HttpComponent) 
component).setHttpClientConfigurer((org.apache.camel.component.http.HttpClientConfigurer)
 value); return true;
             case "httpConfiguration": ((HttpComponent) 
component).setHttpConfiguration((org.apache.camel.http.common.HttpConfiguration)
 value); return true;
-            case "httpContext": ((HttpComponent) 
component).setHttpContext((org.apache.http.protocol.HttpContext) value); return 
true;
+            case "httpContext": ((HttpComponent) 
component).setHttpContext((org.apache.hc.core5.http.protocol.HttpContext) 
value); return true;
             case "maxTotalConnections": ((HttpComponent) 
component).setMaxTotalConnections((int) value); return true;
             case "redirectHandlingDisabled": ((HttpComponent) 
component).setRedirectHandlingDisabled((boolean) value); return true;
             case "headerFilterStrategy": ((HttpComponent) 
component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) 
value); return true;
@@ -771,9 +806,11 @@ public interface HttpsComponentBuilderFactory {
             case "sslContextParameters": ((HttpComponent) 
component).setSslContextParameters((org.apache.camel.support.jsse.SSLContextParameters)
 value); return true;
             case "useGlobalSslContextParameters": ((HttpComponent) 
component).setUseGlobalSslContextParameters((boolean) value); return true;
             case "x509HostnameVerifier": ((HttpComponent) 
component).setX509HostnameVerifier((javax.net.ssl.HostnameVerifier) value); 
return true;
-            case "connectionRequestTimeout": ((HttpComponent) 
component).setConnectionRequestTimeout((int) value); return true;
-            case "connectTimeout": ((HttpComponent) 
component).setConnectTimeout((int) value); return true;
-            case "socketTimeout": ((HttpComponent) 
component).setSocketTimeout((int) value); return true;
+            case "connectionRequestTimeout": ((HttpComponent) 
component).setConnectionRequestTimeout((org.apache.hc.core5.util.Timeout) 
value); return true;
+            case "connectTimeout": ((HttpComponent) 
component).setConnectTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "responseTimeout": ((HttpComponent) 
component).setResponseTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "socketTimeout": ((HttpComponent) 
component).setSocketTimeout((org.apache.hc.core5.util.Timeout) value); return 
true;
+            case "soTimeout": ((HttpComponent) 
component).setSoTimeout((org.apache.hc.core5.util.Timeout) value); return true;
             default: return false;
             }
         }
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json 
b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 8755c6b185c..cc3d0507ad4 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -2931,7 +2931,7 @@
     "kind": "component",
     "name": "http",
     "title": "HTTP",
-    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 4.x.",
+    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 5.x.",
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.3.0",
@@ -2955,7 +2955,7 @@
     "kind": "component",
     "name": "https",
     "title": "HTTPS (Secure)",
-    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 4.x.",
+    "description": "Send requests to external HTTP servers using Apache HTTP 
Client 5.x.",
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.3.0",
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 12fa8bd1617..8166bba3ad2 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
@@ -6149,7 +6149,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * HTTP (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
@@ -6169,7 +6169,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * HTTP (camel-http)
-     * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+     * Send requests to external HTTP servers using Apache HTTP Client 5.x.
      * 
      * Category: http
      * Since: 2.3
diff --git 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 4f0b2fac4a0..321fc8525df 100644
--- 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+ * Send requests to external HTTP servers using Apache HTTP Client 5.x.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -771,7 +771,7 @@ public interface HttpEndpointBuilderFactory {
          * then performed by the cookieHandler.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.client.CookieStore&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.cookie.CookieStore&lt;/code&gt; type.
          * 
          * Group: producer (advanced)
          * 
@@ -779,7 +779,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedHttpEndpointBuilder cookieStore(
-                org.apache.http.client.CookieStore cookieStore) {
+                org.apache.hc.client5.http.cookie.CookieStore cookieStore) {
             doSetProperty("cookieStore", cookieStore);
             return this;
         }
@@ -793,7 +793,7 @@ public interface HttpEndpointBuilderFactory {
          * then performed by the cookieHandler.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.http.client.CookieStore&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.cookie.CookieStore&lt;/code&gt; type.
          * 
          * Group: producer (advanced)
          * 
@@ -1172,7 +1172,7 @@ public interface HttpEndpointBuilderFactory {
          * endpoint.
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.impl.client.HttpClientBuilder&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.HttpClientBuilder&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1180,7 +1180,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedHttpEndpointBuilder clientBuilder(
-                org.apache.http.impl.client.HttpClientBuilder clientBuilder) {
+                org.apache.hc.client5.http.impl.classic.HttpClientBuilder 
clientBuilder) {
             doSetProperty("clientBuilder", clientBuilder);
             return this;
         }
@@ -1190,7 +1190,7 @@ public interface HttpEndpointBuilderFactory {
          * endpoint.
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.impl.client.HttpClientBuilder&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.HttpClientBuilder&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1205,7 +1205,7 @@ public interface HttpEndpointBuilderFactory {
          * To use a custom HttpClientConnectionManager to manage connections.
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.conn.HttpClientConnectionManager&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.io.HttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1213,7 +1213,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedHttpEndpointBuilder clientConnectionManager(
-                org.apache.http.conn.HttpClientConnectionManager 
clientConnectionManager) {
+                org.apache.hc.client5.http.io.HttpClientConnectionManager 
clientConnectionManager) {
             doSetProperty("clientConnectionManager", clientConnectionManager);
             return this;
         }
@@ -1221,7 +1221,7 @@ public interface HttpEndpointBuilderFactory {
          * To use a custom HttpClientConnectionManager to manage connections.
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.conn.HttpClientConnectionManager&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.io.HttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1269,7 +1269,7 @@ public interface HttpEndpointBuilderFactory {
          * Sets a custom HttpClient to be used by the producer.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.client.HttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.classic.HttpClient&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1277,7 +1277,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedHttpEndpointBuilder httpClient(
-                org.apache.http.client.HttpClient httpClient) {
+                org.apache.hc.client5.http.classic.HttpClient httpClient) {
             doSetProperty("httpClient", httpClient);
             return this;
         }
@@ -1285,7 +1285,7 @@ public interface HttpEndpointBuilderFactory {
          * Sets a custom HttpClient to be used by the producer.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.http.client.HttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.classic.HttpClient&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1371,11 +1371,52 @@ public interface HttpEndpointBuilderFactory {
             doSetMultiValueProperties("httpClientOptions", "httpClient.", 
values);
             return this;
         }
+        /**
+         * To configure the connection and the socket using the key/values from
+         * the Map.
+         * 
+         * The option is a: &lt;code&gt;java.util.Map&amp;lt;java.lang.String,
+         * java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is multivalued, and you can use the
+         * httpConnectionOptions(String, Object) method to add a value (call 
the
+         * method multiple times to set more values).
+         * 
+         * Group: advanced
+         * 
+         * @param key the option key
+         * @param value the option value
+         * @return the dsl builder
+         */
+        default AdvancedHttpEndpointBuilder httpConnectionOptions(
+                String key,
+                Object value) {
+            doSetMultiValueProperty("httpConnectionOptions", "httpConnection." 
+ key, value);
+            return this;
+        }
+        /**
+         * To configure the connection and the socket using the key/values from
+         * the Map.
+         * 
+         * The option is a: &lt;code&gt;java.util.Map&amp;lt;java.lang.String,
+         * java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is multivalued, and you can use the
+         * httpConnectionOptions(String, Object) method to add a value (call 
the
+         * method multiple times to set more values).
+         * 
+         * Group: advanced
+         * 
+         * @param values the values
+         * @return the dsl builder
+         */
+        default AdvancedHttpEndpointBuilder httpConnectionOptions(Map values) {
+            doSetMultiValueProperties("httpConnectionOptions", 
"httpConnection.", values);
+            return this;
+        }
         /**
          * To use a custom HttpContext instance.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.http.protocol.HttpContext&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.core5.http.protocol.HttpContext&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1383,7 +1424,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedHttpEndpointBuilder httpContext(
-                org.apache.http.protocol.HttpContext httpContext) {
+                org.apache.hc.core5.http.protocol.HttpContext httpContext) {
             doSetProperty("httpContext", httpContext);
             return this;
         }
@@ -1391,7 +1432,7 @@ public interface HttpEndpointBuilderFactory {
          * To use a custom HttpContext instance.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.http.protocol.HttpContext&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.core5.http.protocol.HttpContext&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1472,7 +1513,7 @@ public interface HttpEndpointBuilderFactory {
     public interface HttpBuilders {
         /**
          * HTTP (camel-http)
-         * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+         * Send requests to external HTTP servers using Apache HTTP Client 5.x.
          * 
          * Category: http
          * Since: 2.3
@@ -1485,7 +1526,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * HTTP (camel-http)
-         * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+         * Send requests to external HTTP servers using Apache HTTP Client 5.x.
          * 
          * Category: http
          * Since: 2.3
@@ -1504,7 +1545,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * HTTP (camel-http)
-         * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+         * Send requests to external HTTP servers using Apache HTTP Client 5.x.
          * 
          * Category: http
          * Since: 2.3
@@ -1525,7 +1566,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * HTTPS (Secure) (camel-http)
-         * Send requests to external HTTP servers using Apache HTTP Client 4.x.
+         * Send requests to external HTTP servers using Apache HTTP Client 5.x.
          * 
          * Category: http
          * Since: 2.3
diff --git 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
index ae045614266..c0e61b05129 100644
--- 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
+++ 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
@@ -1141,7 +1141,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1149,7 +1149,7 @@ public interface WeatherEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedWeatherEndpointConsumerBuilder httpClient(
-                org.apache.http.impl.client.CloseableHttpClient httpClient) {
+                org.apache.hc.client5.http.impl.classic.CloseableHttpClient 
httpClient) {
             doSetProperty("httpClient", httpClient);
             return this;
         }
@@ -1158,7 +1158,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1662,7 +1662,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -1670,7 +1670,7 @@ public interface WeatherEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedWeatherEndpointProducerBuilder httpClient(
-                org.apache.http.impl.client.CloseableHttpClient httpClient) {
+                org.apache.hc.client5.http.impl.classic.CloseableHttpClient 
httpClient) {
             doSetProperty("httpClient", httpClient);
             return this;
         }
@@ -1679,7 +1679,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -2136,7 +2136,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -2144,7 +2144,7 @@ public interface WeatherEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedWeatherEndpointBuilder httpClient(
-                org.apache.http.impl.client.CloseableHttpClient httpClient) {
+                org.apache.hc.client5.http.impl.classic.CloseableHttpClient 
httpClient) {
             doSetProperty("httpClient", httpClient);
             return this;
         }
@@ -2153,7 +2153,7 @@ public interface WeatherEndpointBuilderFactory {
          * proxy).
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.impl.client.CloseableHttpClient&lt;/code&gt; type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.classic.CloseableHttpClient&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
diff --git 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WorkdayEndpointBuilderFactory.java
 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WorkdayEndpointBuilderFactory.java
index 5aa17084698..2cff8240c6e 100644
--- 
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WorkdayEndpointBuilderFactory.java
+++ 
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WorkdayEndpointBuilderFactory.java
@@ -195,7 +195,7 @@ public interface WorkdayEndpointBuilderFactory {
          * Pool connection manager for advanced configuration.
          * 
          * The option is a:
-         * 
&lt;code&gt;org.apache.http.impl.conn.PoolingHttpClientConnectionManager&lt;/code&gt;
 type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 
@@ -203,7 +203,7 @@ public interface WorkdayEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedWorkdayEndpointBuilder httpConnectionManager(
-                org.apache.http.impl.conn.PoolingHttpClientConnectionManager 
httpConnectionManager) {
+                
org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager 
httpConnectionManager) {
             doSetProperty("httpConnectionManager", httpConnectionManager);
             return this;
         }
@@ -211,7 +211,7 @@ public interface WorkdayEndpointBuilderFactory {
          * Pool connection manager for advanced configuration.
          * 
          * The option will be converted to a
-         * 
&lt;code&gt;org.apache.http.impl.conn.PoolingHttpClientConnectionManager&lt;/code&gt;
 type.
+         * 
&lt;code&gt;org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager&lt;/code&gt;
 type.
          * 
          * Group: advanced
          * 

Reply via email to