Merge pull request #25754 from vespa-engine/balder/reapply-apache-5.1-to-5.2

Upgrade apache 5.1 => 5.2 and add deprecation suppressions.

2 files changed, 3 insertions, 0 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index 7f4499797e8..3baed3e1b04 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -187,6 +187,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent implements Ru
                 .toList();
     }
 
+    @SuppressWarnings("deprecation")
     static CloseableHttpAsyncClient createHttpClient() {
         return VespaAsyncHttpClientBuilder.create()
                 .setIOReactorConfig(IOReactorConfig.custom()
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
index 790b3298a81..f766bebe4a2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
@@ -46,6 +46,7 @@ public abstract class HttpMetricFetcher {
         log.log(Level.FINE, () -> "Fetching metrics from " + u + " with timeout " + CONNECTION_TIMEOUT);
     }
 
+    @SuppressWarnings("deprecation")
     CloseableHttpResponse getResponse() throws IOException {
         log.log(Level.FINE, () -> "Connecting to url " + url + " for service '" + service + "'");
         return httpClient.execute(new HttpGet(url));
@@ -80,6 +81,7 @@ public abstract class HttpMetricFetcher {
         }
     }
 
+    @SuppressWarnings("deprecation")
     private static CloseableHttpClient createHttpClient() {
         return VespaHttpClientBuilder.create(registry -> {
                     var mgr = new PoolingHttpClientConnectionManager(registry);