Avoid deprecated apache http 5.2 methods, by adding it to the builder.

2 files changed, 2 insertions, 6 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
index 4a74d841ce2..7c1b0cc3099 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
@@ -61,12 +61,10 @@ public class MetricsV2Handler extends HttpHandlerBase {
         }
     }
 
-    @SuppressWarnings("deprecation")
     private static CloseableHttpClient createHttpClient() {
-        return VespaHttpClientBuilder.create()
+        return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder()
                 .setUserAgent("application-metrics-retriever")
                 .setDefaultRequestConfig(RequestConfig.custom()
-                                                      .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS)
                                                       .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS)
                                                       .build())
                 .build();
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
index f830a55e940..960cb795ad6 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
@@ -62,12 +62,10 @@ public class PrometheusV1Handler extends HttpHandlerBase {
         }
     }
 
-    @SuppressWarnings("deprecation")
     private static CloseableHttpClient createHttpClient() {
-        return VespaHttpClientBuilder.create()
+        return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder()
                 .setUserAgent("application-prometheus-receiver")
                 .setDefaultRequestConfig(RequestConfig.custom()
-                                            .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS)
                                             .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS)
                                             .build())
                 .build();