From 77040640ff6110f637b9d79a94b5ffa715b3d206 Mon Sep 17 00:00:00 2001
From: Jono Morris <jono@apache.org>
Date: Mon, 30 Sep 2024 19:22:27 +1300
Subject: [PATCH] httpclient upgrade to 5.4 (#15747)

---
 .../apache/camel/component/graphql/server/GraphqlServer.java  | 1 +
 .../apache/camel/component/http/HttpsAuthenticationTest.java  | 4 ++--
 .../wordpress/api/test/WordpressMockServerTestSupport.java    | 2 +-
 parent/pom.xml                                                | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/server/GraphqlServer.java b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/server/GraphqlServer.java
index 4621f5f77f978..43edb1942bdc1 100644
--- a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/server/GraphqlServer.java
+++ b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/server/GraphqlServer.java
@@ -43,6 +43,7 @@ public class GraphqlServer {
     public GraphqlServer() {
         this.graphql = GraphqlFactory.newGraphQL();
         this.server = ServerBootstrap.bootstrap()
+                .setCanonicalHostName("localhost")
                 .register("/graphql", new GraphqlHandler())
                 .create();
     }
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
index 4bddb8193742b..95ae51f9b2a06 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
@@ -90,8 +90,8 @@ HttpContext basicAuthContext() {
         authCache.put(new HttpHost("localhost", 8083), basicAuth);
 
         HttpClientContext context = HttpClientContext.create();
-        context.setAuthCache(authCache);
-        context.setCredentialsProvider(provider);
+        context.setAttribute(HttpClientContext.AUTH_CACHE, authCache);
+        context.setAttribute(HttpClientContext.CREDS_PROVIDER, provider);
 
         return context;
     }
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
index ea455da3a5caa..40af1e59f3e97 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
@@ -83,7 +83,7 @@ private static HttpServer createServer(int port) {
         usersSingleUpdateRequestHandlers.put("DELETE", "/data/users/delete.json");
 
         // @formatter:off
-        return ServerBootstrap.bootstrap().setListenerPort(port)
+        return ServerBootstrap.bootstrap().setCanonicalHostName("localhost").setListenerPort(port)
                 .register("/wp/v2/posts", new WordpressServerHttpRequestHandler(postsListCreateRequestHandlers))
                 .register("/wp/v2/posts/*", new WordpressServerHttpRequestHandler(postsSingleUpdateRequestHandlers))
                 .register("/wp/v2/users", new WordpressServerHttpRequestHandler(usersListCreateRequestHandlers))
diff --git a/parent/pom.xml b/parent/pom.xml
index 63c7ca15fb7f1..182b57a7be1ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,7 @@
         <hsqldb-version>2.7.3</hsqldb-version>
         <httpunit-version>1.7</httpunit-version>
         <httpcore-version>5.3</httpcore-version>
-        <httpclient-version>5.2.1</httpclient-version>
+        <httpclient-version>5.4</httpclient-version>
         <httpcore4-version>4.4.16</httpcore4-version>
         <httpclient4-version>4.5.14</httpclient4-version>
         <httpasyncclient-version>4.1.5</httpasyncclient-version>