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 f75f60059860 camel-http: replace deprecated httpcomponent-client code. 
(#21699)
f75f60059860 is described below

commit f75f600598602418ced12ee6c53fb8a34945e4bd
Author: Claudio Miranda <[email protected]>
AuthorDate: Wed Mar 4 15:47:01 2026 -0300

    camel-http: replace deprecated httpcomponent-client code. (#21699)
    
    * camel-http: replace deprecated httpclient api
    
    * camel-http: add a note about the NTLM deprecation in the migration guide 
of 4.12
---
 .../camel/http/common/DefaultHttpBinding.java      |  5 +-
 .../org/apache/camel/http/common/HttpHelper.java   |  4 --
 .../http/common/HttpRestHeaderFilterStrategy.java  |  1 +
 .../camel/http/common/DefaultHttpBindingTest.java  |  9 +--
 .../http/common/HttpHeaderFilterStrategyTest.java  |  6 +-
 .../http/common/cookie/CookieHandlerTest.java      |  7 ++-
 .../apache/camel/component/http/HttpComponent.java | 67 +++++++++++-----------
 .../apache/camel/component/http/HttpProducer.java  | 11 +---
 .../camel/component/http/NoopCookieStore.java      |  7 +++
 .../camel/component/http/HttpMethodsTest.java      |  5 +-
 .../component/http/HttpServerTestSupport.java      |  2 +-
 ...psTwoComponentsSslContextParametersGetTest.java |  2 +-
 .../ROOT/pages/camel-4x-upgrade-guide-4_12.adoc    |  4 ++
 13 files changed, 68 insertions(+), 62 deletions(-)

diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 797f83c3bd05..770d2cee17a8 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -369,9 +369,10 @@ public class DefaultHttpBinding implements HttpBinding {
                 doWriteFaultResponse(target, response, exchange);
             }
         } else {
-            if (exchange.hasOut()) {
+            if (exchange.getMessage() != null) {
+                // if (exchange.getOut() != null) {
                 // just copy the protocol relates header if we do not have them
-                copyProtocolHeaders(exchange.getIn(), exchange.getOut());
+                copyProtocolHeaders(exchange.getIn(), exchange.getMessage());
             }
             doWriteResponse(target, response, exchange);
         }
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 337e9aca3821..ee5496f6e81a 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -59,10 +59,6 @@ public final class HttpHelper {
         HttpUtil.setCharsetFromContentType(contentType, exchange);
     }
 
-    public static String getCharsetFromContentType(String contentType) {
-        return HttpUtil.getCharsetFromContentType(contentType);
-    }
-
     /**
      * Writes the given object as response body to the servlet response
      * <p/>
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
index d11f1cb009b1..264a5cd887e4 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
@@ -17,6 +17,7 @@
 package org.apache.camel.http.common;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.http.base.HttpHeaderFilterStrategy;
 
 public class HttpRestHeaderFilterStrategy extends HttpHeaderFilterStrategy {
 
diff --git 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java
 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java
index 90e26a30d3ca..80c7ea14f6ac 100644
--- 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java
+++ 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.Locale;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.test.junit6.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
@@ -32,7 +33,7 @@ public class DefaultHttpBindingTest extends CamelTestSupport {
     public void testConvertDate() {
         DefaultHttpBinding binding = new DefaultHttpBinding();
         Date date = new Date();
-        Exchange exchange = super.createExchangeWithBody(null);
+        Exchange exchange = new DefaultExchange(context);
 
         String value = binding.convertHeaderValueToString(exchange, date);
         assertNotEquals(value, date.toString());
@@ -43,7 +44,7 @@ public class DefaultHttpBindingTest extends CamelTestSupport {
     public void testConvertDateTypeConverter() {
         DefaultHttpBinding binding = new DefaultHttpBinding();
         Date date = new Date();
-        Exchange exchange = super.createExchangeWithBody(null);
+        Exchange exchange = new DefaultExchange(context);
         exchange.setProperty(DefaultHttpBinding.DATE_LOCALE_CONVERSION, false);
         String value = binding.convertHeaderValueToString(exchange, date);
         assertEquals(value, date.toString());
@@ -53,7 +54,7 @@ public class DefaultHttpBindingTest extends CamelTestSupport {
     public void testConvertLocale() {
         DefaultHttpBinding binding = new DefaultHttpBinding();
         Locale l = Locale.SIMPLIFIED_CHINESE;
-        Exchange exchange = super.createExchangeWithBody(null);
+        Exchange exchange = new DefaultExchange(context);
 
         String value = binding.convertHeaderValueToString(exchange, l);
         assertNotEquals(value, l.toString());
@@ -64,7 +65,7 @@ public class DefaultHttpBindingTest extends CamelTestSupport {
     public void testConvertLocaleTypeConverter() {
         DefaultHttpBinding binding = new DefaultHttpBinding();
         Locale l = Locale.SIMPLIFIED_CHINESE;
-        Exchange exchange = super.createExchangeWithBody(null);
+        Exchange exchange = new DefaultExchange(context);
         exchange.setProperty(DefaultHttpBinding.DATE_LOCALE_CONVERSION, false);
         String value = binding.convertHeaderValueToString(exchange, l);
         assertEquals(value, l.toString());
diff --git 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
index e37bcfd9d940..c82ea7d3a7a7 100644
--- 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
@@ -17,8 +17,10 @@
 package org.apache.camel.http.common;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.http.base.HttpHeaderFilterStrategy;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -29,8 +31,8 @@ public class HttpHeaderFilterStrategyTest extends 
CamelTestSupport {
     private HttpHeaderFilterStrategy filter;
     private Exchange exchange;
 
-    @Override
-    public void doPostSetup() throws Exception {
+    @BeforeEach
+    public void setupTest() throws Exception {
         filter = new HttpHeaderFilterStrategy();
         exchange = new DefaultExchange(context);
     }
diff --git 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
index 89a08c3e317d..73db39b91429 100644
--- 
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
+++ 
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.http.base.cookie.CookieHandler;
 import org.apache.camel.http.base.cookie.ExchangeCookieHandler;
 import org.apache.camel.http.base.cookie.InstanceCookieHandler;
 import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -65,9 +66,9 @@ public class CookieHandlerTest extends CamelTestSupport {
                         "ExchangeCookieHandler with ACCEPT_ALL"));
     }
 
-    @Override
-    public void doPostSetup() throws Exception {
-        exchange = createExchangeWithBody(null);
+    @BeforeEach
+    public void setupTest() throws Exception {
+        exchange = new org.apache.camel.support.DefaultExchange(context);
     }
 
     @ParameterizedTest
diff --git 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 1b4abff25408..409f3071d05d 100644
--- 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -54,18 +54,17 @@ import org.apache.camel.util.PropertiesHelper;
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
+import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.cookie.CookieStore;
 import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import 
org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.pool.PoolConcurrencyPolicy;
@@ -541,17 +540,14 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
         final int connectionsPerRoute = getAndRemoveParameter(parameters, 
"connectionsPerRoute", int.class, 0);
         // do not remove as we set this later again
         final boolean sysProp = getParameter(parameters, 
"useSystemProperties", boolean.class, useSystemProperties);
-
-        final Registry<ConnectionSocketFactory> connectionRegistry
-                = createConnectionRegistry(hostnameVerifier, 
sslContextParameters, sysProp);
+        final TlsSocketStrategy tlsStrategy = 
createTlsStrategy(hostnameVerifier, sslContextParameters, sysProp);
 
         // allow the builder pattern
         
httpConnectionOptions.putAll(PropertiesHelper.extractProperties(parameters, 
"httpConnection."));
         SocketConfig.Builder socketConfigBuilder = SocketConfig.custom();
         PropertyBindingSupport.bindProperties(getCamelContext(), 
socketConfigBuilder, httpConnectionOptions);
 
-        return createConnectionManager(connectionRegistry, 
maxTotalConnections, connectionsPerRoute,
-                socketConfigBuilder.build());
+        return createConnectionManager(tlsStrategy, maxTotalConnections, 
connectionsPerRoute, socketConfigBuilder.build());
     }
 
     protected HttpClientBuilder createHttpClientBuilder(
@@ -601,45 +597,50 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
         return clientBuilder;
     }
 
-    protected Registry<ConnectionSocketFactory> createConnectionRegistry(
-            HostnameVerifier x509HostnameVerifier, SSLContextParameters 
sslContextParams,
-            boolean useSystemProperties)
+    protected TlsSocketStrategy createTlsStrategy(
+            HostnameVerifier x509HostnameVerifier,
+            SSLContextParameters sslContextParams, boolean useSystemProperties)
             throws GeneralSecurityException, IOException {
-        // create the default connection registry to use
-        RegistryBuilder<ConnectionSocketFactory> builder = 
RegistryBuilder.create();
-        builder.register("http", 
PlainConnectionSocketFactory.getSocketFactory());
+        // create the TLS strategy to use
         if (sslContextParams != null) {
-            builder.register("https",
-                    new 
SSLConnectionSocketFactory(sslContextParams.createSSLContext(getCamelContext()),
 x509HostnameVerifier));
+            return new 
DefaultClientTlsStrategy(sslContextParams.createSSLContext(getCamelContext()), 
x509HostnameVerifier);
         } else {
-            builder.register("https", new SSLConnectionSocketFactory(
+            return new DefaultClientTlsStrategy(
                     useSystemProperties ? SSLContexts.createSystemDefault() : 
SSLContexts.createDefault(),
-                    x509HostnameVerifier));
+                    x509HostnameVerifier);
         }
-        return builder.build();
     }
 
     protected HttpClientConnectionManager createConnectionManager(
-            Registry<ConnectionSocketFactory> registry, int 
maxTotalConnections, int connectionsPerRoute,
-            SocketConfig defaultSocketConfig) {
-        // set up the connection live time
-        PoolingHttpClientConnectionManager answer = new 
PoolingHttpClientConnectionManager(
-                registry, PoolConcurrencyPolicy.STRICT, 
TimeValue.ofMilliseconds(getConnectionTimeToLive()), null);
+            TlsSocketStrategy tlsStrategy,
+            int maxTotalConnections, int connectionsPerRoute, SocketConfig 
defaultSocketConfig) {
+        // set up the connection using the builder pattern
+        ConnectionConfig connConfig = ConnectionConfig.custom()
+                
.setTimeToLive(TimeValue.ofMilliseconds(getConnectionTimeToLive()))
+                .build();
+        PoolingHttpClientConnectionManagerBuilder builder = 
PoolingHttpClientConnectionManagerBuilder.create()
+                .setTlsSocketStrategy(tlsStrategy)
+                .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
+                .setDefaultConnectionConfig(connConfig)
+                .setDefaultSocketConfig(defaultSocketConfig);
+
         int localMaxTotalConnections = maxTotalConnections;
         if (localMaxTotalConnections == 0) {
             localMaxTotalConnections = getMaxTotalConnections();
         }
         if (localMaxTotalConnections > 0) {
-            answer.setMaxTotal(localMaxTotalConnections);
+            builder.setMaxConnTotal(localMaxTotalConnections);
         }
-        answer.setDefaultSocketConfig(defaultSocketConfig);
+
         int localConnectionsPerRoute = connectionsPerRoute;
         if (localConnectionsPerRoute == 0) {
             localConnectionsPerRoute = getConnectionsPerRoute();
         }
         if (localConnectionsPerRoute > 0) {
-            answer.setDefaultMaxPerRoute(localConnectionsPerRoute);
+            builder.setMaxConnPerRoute(localConnectionsPerRoute);
         }
+
+        PoolingHttpClientConnectionManager answer = builder.build();
         LOG.debug("Created ClientConnectionManager {}", answer);
 
         return answer;
@@ -740,7 +741,7 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
     }
 
     /**
-     * To use a custom org.apache.http.protocol.HttpContext when executing 
requests.
+     * To use a custom HttpContext when executing requests.
      */
     public void setHttpContext(HttpContext httpContext) {
         this.httpContext = httpContext;
@@ -829,9 +830,9 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
     }
 
     /**
-     * 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 (e.g., acting as a proxy).
+     * 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 store as cookie shouldn't be
+     * stored as we are just bridging (e.g., acting as a proxy).
      */
     public void setCookieStore(CookieStore cookieStore) {
         this.cookieStore = cookieStore;
diff --git 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 9c30cfd9631d..8931a5607fa3 100644
--- 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -64,7 +64,6 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
-import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
@@ -81,8 +80,8 @@ import org.apache.hc.core5.http.io.entity.FileEntity;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
 import org.apache.hc.core5.http.io.entity.NullEntity;
 import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -239,7 +238,6 @@ public class HttpProducer extends DefaultProducer 
implements LineNumberAware {
         if (getEndpoint().isPreserveHostHeader()) {
             String hostHeader = 
exchange.getIn().getHeader(HttpConstants.HTTP_HEADER_HOST, String.class);
             if (hostHeader != null) {
-                //HttpClient 4 will check to see if the Host header is 
present, and use it if it is, see org.apache.http.protocol.RequestTargetHost in 
httpcore
                 httpRequest.setHeader(HttpConstants.HTTP_HEADER_HOST, 
hostHeader);
             }
         }
@@ -485,12 +483,7 @@ public class HttpProducer extends DefaultProducer 
implements LineNumberAware {
             Exchange exchange, HttpHost httpHost, HttpUriRequest httpRequest, 
HttpClientResponseHandler<T> handler)
             throws IOException, HttpException {
         // use a local context per execution
-        HttpContext localContext;
-        if (httpContext != null) {
-            localContext = new BasicHttpContext(httpContext);
-        } else {
-            localContext = HttpClientContext.create();
-        }
+        HttpContext localContext = new HttpCoreContext(httpContext);
         if (getEndpoint().getHttpActivityListener() != null) {
             localContext.setAttribute("org.apache.camel.Exchange", exchange);
             localContext.setAttribute("org.apache.hc.core5.http.HttpHost", 
httpHost);
diff --git 
a/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
 
b/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
index d9480ac3fbec..995f7061bcc2 100644
--- 
a/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
+++ 
b/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.http;
 
+import java.time.Instant;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -39,10 +40,16 @@ public class NoopCookieStore implements CookieStore {
     }
 
     @Override
+    @Deprecated
     public boolean clearExpired(Date date) {
         return false;
     }
 
+    @Override
+    public boolean clearExpired(Instant instant) {
+        return false;
+    }
+
     @Override
     public void clear() {
         // noop
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
index 802046102f19..13b2e12c3726 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
@@ -37,7 +37,6 @@ import static 
org.apache.camel.component.http.HttpMethods.TRACE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HttpMethodsTest extends BaseHttpTest {
 
@@ -101,7 +100,7 @@ public class HttpMethodsTest extends BaseHttpTest {
                 exchange1 -> exchange1.getIn().setHeader(Exchange.HTTP_METHOD, 
"PATCH"));
 
         assertNotNull(exchange);
-        assertTrue(exchange.hasOut());
+        assertNotNull(exchange.getMessage());
 
         Message out = exchange.getMessage();
         Map<String, Object> headers = out.getHeaders();
@@ -119,7 +118,7 @@ public class HttpMethodsTest extends BaseHttpTest {
                 exchange1 -> exchange1.getIn().setBody("rocks camel?"));
 
         assertNotNull(exchange);
-        assertTrue(exchange.hasOut());
+        assertNotNull(exchange.getMessage());
 
         Message out = exchange.getMessage();
         Map<String, Object> headers = out.getHeaders();
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
index 7cbcb47cf5d0..e7ae8dccb9ba 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
@@ -30,7 +30,7 @@ import org.apache.hc.core5.http.protocol.HttpProcessor;
 public abstract class HttpServerTestSupport extends CamelTestSupport {
 
     /**
-     * Returns the org.apache.http.protocol.BasicHttpProcessor which should be 
used by the server.
+     * Returns the org.apache.hc.core5.http.protocol.HttpProcessor which 
should be used by the server.
      *
      * @return HttpProcessor
      */
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
index 334a63835536..29491d73556b 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -59,7 +59,7 @@ public class HttpsTwoComponentsSslContextParametersGetTest 
extends BaseHttpsTest
                 .setRequestRouter(RequestRouter.create(
                         new URIAuthority("localhost"),
                         UriPatternType.URI_PATTERN,
-                        Collections.EMPTY_LIST,
+                        Collections.emptyList(),
                         RequestRouter.LOCAL_AUTHORITY_RESOLVER,
                         null))
                 
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc
index 3d43fa6885b2..9b2c2241ee3d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc
@@ -250,6 +250,10 @@ The code was upgraded to LangChain4j version 1.0.0, which 
brings a few breaking
 - By default, tokenization now uses segment sizes
 - To tokenize by tokens, the model used in the system must be provided
 
+=== camel-http
+
+Deprecate NTLM as an authentication method, you can use the Basic/Bearer 
authentication with TLS.
+
 === Known regressions
 
 On Windows, Camel Jbang export is no more working out of the box. A workaround 
consists in providing `--maven-wrapper=false`.

Reply via email to