From 9ec1c0b9585e2c845d47c396f72229aad23abac7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 26 Jan 2023 15:26:12 +0100 Subject: Upgrade apache 5.1 => 5.2 and add deprecation suppressions. --- cloud-tenant-base-dependencies-enforcer/pom.xml | 4 +- .../application/ConfigConvergenceChecker.java | 2 + .../DefaultClusterReindexingStatusClient.java | 1 + .../vespa/config/server/http/LogRetriever.java | 1 + .../config/server/http/SecretStoreValidator.java | 1 + .../config/server/http/SimpleHttpFetcher.java | 1 + .../vespa/config/server/http/TesterClient.java | 1 + .../metrics/ClusterDeploymentMetricsRetriever.java | 39 ++++++------- .../metrics/ClusterProtonMetricsRetriever.java | 2 + .../handler/metrics/MetricsV2Handler.java | 1 + .../handler/metrics/PrometheusV1Handler.java | 1 + .../handler/AbstractProcessingHandler.java | 3 +- .../jdisc/http/server/jetty/SimpleHttpClient.java | 7 +-- .../yahoo/processing/test/ProcessorLibrary.java | 65 +++++++--------------- .../ai/vespa/hosted/client/AbstractHttpClient.java | 2 + .../java/ai/vespa/hosted/client/HttpClient.java | 1 + .../util/http/hc5/HttpToHttpsRoutePlanner.java | 1 + .../util/http/hc5/HttpToHttpsRoutePlannerTest.java | 1 + .../application/ApplicationMetricsRetriever.java | 1 + .../metricsproxy/service/HttpMetricFetcher.java | 2 + parent/pom.xml | 4 +- .../allowed-maven-dependencies.txt | 6 +- .../ai/vespa/feed/client/impl/ApacheCluster.java | 2 + .../status/FileDistributionStatusClient.java | 1 + 24 files changed, 69 insertions(+), 81 deletions(-) diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 4e664934ef9..5e5325fd5ad 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -24,8 +24,8 @@ 1.72 1.15 7.0.1 - 5.1.4 - 5.1.5 + 5.2.1 + 5.2.1 4.5.14 4.4.16 5.8.1 diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java index b7b509c899c..4e02964fa58 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java @@ -280,6 +280,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { } } + @SuppressWarnings("deprecation") private static RequestConfig createRequestConfig(Duration timeout) { return RequestConfig.custom() .setConnectionRequestTimeout(Timeout.ofSeconds(1)) @@ -288,6 +289,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { .build(); } + @SuppressWarnings("deprecation") private static CloseableHttpAsyncClient createHttpClient() { return VespaAsyncHttpClientBuilder .create(tlsStrategy -> diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java index b2672f7ad85..89c57dd6e0e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java @@ -146,6 +146,7 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt } + @SuppressWarnings("deprecation") private static CloseableHttpAsyncClient createHttpClient() { return VespaAsyncHttpClientBuilder .create() diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java index 3be99ab8393..17a3b186beb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java @@ -20,6 +20,7 @@ public class LogRetriever { private final CloseableHttpClient httpClient = VespaHttpClientBuilder.create().build(); + @SuppressWarnings("deprecation") public HttpResponse getLogs(String logServerUri, Optional deployTime) { HttpGet get = new HttpGet(logServerUri); try { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java index 17f33e477ec..78fdf0a4a02 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java @@ -58,6 +58,7 @@ public class SecretStoreValidator { return URI.create(PROTOCOL + hostname + AWS_PARAMETER_VALIDATION_HANDLER_POSTFIX); } + @SuppressWarnings("deprecation") private HttpResponse postRequest(URI uri, Slime slime) { var postRequest = new HttpPost(uri); var data = uncheck(() -> SlimeUtils.toJsonBytes(slime)); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java index a8dfe3700e7..da4e5d24c48 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java @@ -34,6 +34,7 @@ public class SimpleHttpFetcher implements HttpFetcher { } @Override + @SuppressWarnings("deprecation") public HttpResponse get(Params params, URI url) { try { HttpGet request = new HttpGet(url); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java index 69bccfe788d..4b339f72fa6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java @@ -64,6 +64,7 @@ public class TesterClient { return execute(new HttpGet(testerUri), "Failed to get test report"); } + @SuppressWarnings("deprecation") private HttpResponse execute(HttpUriRequest request, String messageIfRequestFails) { logger.log(Level.FINE, () -> "Sending request to tester container " + request.getRequestUri()); try { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java index 98f01bada3f..1577e807036 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java @@ -55,6 +55,7 @@ public class ClusterDeploymentMetricsRetriever { private static final ExecutorService executor = Executors.newFixedThreadPool(10, new DaemonThreadFactory("cluster-deployment-metrics-retriever-")); + @SuppressWarnings("deprecation") private static final CloseableHttpClient httpClient = VespaHttpClientBuilder .create(registry -> new PoolingHttpClientConnectionManager(registry, @@ -128,31 +129,22 @@ public class ClusterDeploymentMetricsRetriever { Supplier aggregator = () -> clusterMetricsMap.computeIfAbsent(clusterInfo, c -> new DeploymentMetricsAggregator()); switch (serviceName) { - case VESPA_CONTAINER: + case VESPA_CONTAINER -> { optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> - aggregator.get() - .addContainerLatency(qlSum, values.field("query_latency.count").asDouble())); + aggregator.get().addContainerLatency(qlSum, values.field("query_latency.count").asDouble())); optionalDouble(values.field("feed.latency.sum")).ifPresent(flSum -> - aggregator.get() - .addFeedLatency(flSum, values.field("feed.latency.count").asDouble())); - break; - case VESPA_QRSERVER: - optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> - aggregator.get() - .addQrLatency(qlSum, values.field("query_latency.count").asDouble())); - break; - case VESPA_DISTRIBUTOR: - optionalDouble(values.field("vds.distributor.docsstored.average")) - .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); - break; - case VESPA_CONTAINER_CLUSTERCONTROLLER: - optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil -> - aggregator.get() - .addMemoryUsage(memoryUtil, - values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble()) - .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(), - values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble())); - break; + aggregator.get().addFeedLatency(flSum, values.field("feed.latency.count").asDouble())); + } + case VESPA_QRSERVER -> optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> + aggregator.get().addQrLatency(qlSum, values.field("query_latency.count").asDouble())); + case VESPA_DISTRIBUTOR -> optionalDouble(values.field("vds.distributor.docsstored.average")) + .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); + case VESPA_CONTAINER_CLUSTERCONTROLLER -> + optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil -> + aggregator.get() + .addMemoryUsage(memoryUtil, values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble()) + .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(), + values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble())); } } @@ -160,6 +152,7 @@ public class ClusterDeploymentMetricsRetriever { return new ClusterInfo(dimensions.field("clusterid").asString(), dimensions.field("clustertype").asString()); } + @SuppressWarnings("deprecation") private static Slime doMetricsRequest(URI hostURI) { HttpGet get = new HttpGet(hostURI); try (CloseableHttpResponse response = httpClient.execute(get)) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java index d6fde04cd71..0dbe0131e9b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java @@ -27,6 +27,7 @@ public class ClusterProtonMetricsRetriever { private static final Logger log = Logger.getLogger(ClusterProtonMetricsRetriever.class.getName()); + @SuppressWarnings("deprecation") private static final CloseableHttpClient httpClient = VespaHttpClientBuilder .create(PoolingHttpClientConnectionManager::new) .setDefaultRequestConfig( @@ -100,6 +101,7 @@ public class ClusterProtonMetricsRetriever { aggregator.addAll(metrics.field("values")); } + @SuppressWarnings("deprecation") private static Slime doMetricsRequest(URI hostURI) { HttpGet get = new HttpGet(hostURI); try (CloseableHttpResponse response = httpClient.execute(get)) { 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 b3a2205cc0a..4a74d841ce2 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,6 +61,7 @@ public class MetricsV2Handler extends HttpHandlerBase { } } + @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { return VespaHttpClientBuilder.create() .setUserAgent("application-metrics-retriever") 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 3333b3e3090..f830a55e940 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,6 +62,7 @@ public class PrometheusV1Handler extends HttpHandlerBase { } } + @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { return VespaHttpClientBuilder.create() .setUserAgent("application-prometheus-receiver") diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index f4db1c5085a..f7aea8abbd1 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -52,7 +52,7 @@ public abstract class AbstractProcessingHandler ext private final Executor renderingExecutor; - private ChainRegistry chainRegistry; + private final ChainRegistry chainRegistry; private final ComponentRegistry renderers; @@ -109,7 +109,6 @@ public abstract class AbstractProcessingHandler ext } @Override - @SuppressWarnings("unchecked") public HttpResponse handle(HttpRequest request, ContentChannel channel) { com.yahoo.processing.Request processingRequest = new com.yahoo.processing.Request(); populate("", request.propertyMap(), processingRequest.properties()); diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java index 298f0feb9e6..23f89962752 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java @@ -158,6 +158,7 @@ public class SimpleHttpClient implements AutoCloseable { return this; } + @SuppressWarnings("deprecation") public ResponseValidator execute() throws IOException { if (entity != null) { request.setEntity(entity); @@ -189,18 +190,16 @@ public class SimpleHttpClient implements AutoCloseable { return this; } - public ResponseValidator expectHeader(String headerName, Matcher matcher) { + public void expectHeader(String headerName, Matcher matcher) { Header firstHeader = response.getFirstHeader(headerName); String headerValue = firstHeader != null ? firstHeader.getValue() : null; assertThat(headerValue, matcher); assertNotNull(firstHeader); - return this; } - public ResponseValidator expectNoHeader(String headerName) { + public void expectNoHeader(String headerName) { Header firstHeader = response.getFirstHeader(headerName); assertThat(firstHeader, is(nullValue())); - return this; } public ResponseValidator expectContent(final Matcher matcher) { diff --git a/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java b/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java index ee8dbd8dccb..5f5b7171923 100644 --- a/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java +++ b/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java @@ -10,9 +10,18 @@ import com.yahoo.processing.execution.Execution; import com.yahoo.processing.execution.ExecutionWithResponse; import com.yahoo.processing.execution.RunnableExecution; import com.yahoo.processing.request.ErrorMessage; -import com.yahoo.processing.response.*; - -import java.util.*; +import com.yahoo.processing.response.AbstractData; +import com.yahoo.processing.response.ArrayDataList; +import com.yahoo.processing.response.Data; +import com.yahoo.processing.response.DataList; +import com.yahoo.processing.response.FutureResponse; +import com.yahoo.processing.response.IncomingData; +import com.yahoo.processing.response.Ordered; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -50,7 +59,7 @@ public class ProcessorLibrary { public static class MapData extends AbstractData { - private Map map = new LinkedHashMap(); + private final Map map = new LinkedHashMap(); public MapData(Request request) { super(request); @@ -157,7 +166,7 @@ public class ProcessorLibrary { @SafeVarargs @SuppressWarnings("varargs") public Federator(boolean ordered, Chain... chains) { - this.chains = Arrays.asList(chains); + this.chains = List.of(chains); this.ordered = ordered; } @@ -206,7 +215,7 @@ public class ProcessorLibrary { @SafeVarargs @SuppressWarnings("varargs") public EagerReturnFederator(boolean ordered, Chain... chains) { - this.chains = Arrays.asList(chains); + this.chains = List.of(chains); this.ordered = ordered; } @@ -312,21 +321,6 @@ public class ProcessorLibrary { } - /** Allows waiting for that request to happen. */ - public static class RequestCounter extends Processor { - - /** The incoming data this has created */ - public final CompletableFuture incomingData = new CompletableFuture<>(); - - @Override - public Response process(Request request, Execution execution) { - ArrayDataList dataList = ArrayDataList.createAsync(request); - incomingData.complete(dataList.incoming()); - return new Response(dataList); - } - - } - /** * Multiples the amount of data returned by parallelism by performing parallel executions of the rest of the chain */ @@ -412,31 +406,12 @@ public class ProcessorLibrary { } - /** - * A processor which on invocation prints the string given on construction - */ - public static class Echo extends Processor { - - private String s; - - public Echo(String s) { - this.s = s; - } - - @Override - public Response process(Request request, Execution execution) { - System.out.println(s); - return execution.process(request); - } - - } - /** * A processor which adds a StringData item containing the string given in the constructor to every response */ public static class StringDataAdder extends Processor { - private String string; + private final String string; public StringDataAdder(String string) { this.string = string; @@ -458,7 +433,7 @@ public class ProcessorLibrary { */ public static class ErrorAdder extends Processor { - private ErrorMessage errorMessage; + private final ErrorMessage errorMessage; public ErrorAdder(ErrorMessage errorMessage) { this.errorMessage = errorMessage; @@ -478,7 +453,7 @@ public class ProcessorLibrary { */ public static class StringDataListAdder extends Processor { - private String[] strings; + private final String[] strings; public StringDataListAdder(String... strings) { this.strings = strings; @@ -502,8 +477,8 @@ public class ProcessorLibrary { */ public static class Trace extends Processor { - private String traceMessage; - private int traceLevel; + private final String traceMessage; + private final int traceLevel; public Trace(String traceMessage, int traceLevel) { this.traceMessage = traceMessage; diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java index f0aaccb82fa..c62be40f1db 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java @@ -47,6 +47,7 @@ public abstract class AbstractHttpClient implements HttpClient { public static HttpClient wrapping(CloseableHttpClient client) { return new AbstractHttpClient() { @Override + @SuppressWarnings("deprecation") protected ClassicHttpResponse execute(ClassicHttpRequest request, HttpClientContext context) throws IOException { return client.execute(request, context); } @@ -113,6 +114,7 @@ public abstract class AbstractHttpClient implements HttpClient { throw new IllegalStateException("No hosts to perform the request against"); } + @SuppressWarnings("deprecation") private HttpClientContext contextWithTimeout(RequestBuilder builder) { HttpClientContext context = HttpClientContext.create(); RequestConfig config = builder.config; diff --git a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java index 10ef20980e6..1f36ae8f8a4 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java @@ -34,6 +34,7 @@ import static java.util.Objects.requireNonNull; /** * @author jonmv */ +@SuppressWarnings("deprecation") public interface HttpClient extends Closeable { RequestConfig defaultRequestConfig = RequestConfig.custom() diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java index cce73cf3b05..0c140ce236e 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java @@ -17,6 +17,7 @@ import org.apache.hc.core5.http.protocol.HttpContext; class HttpToHttpsRoutePlanner implements HttpRoutePlanner { @Override + @SuppressWarnings("deprecation") public HttpRoute determineRoute(HttpHost target, HttpContext context) { if ( ! target.getSchemeName().equals("http") && ! target.getSchemeName().equals("https")) throw new IllegalArgumentException("Scheme must be 'http' or 'https' when using HttpToHttpsRoutePlanner, was '" + target.getSchemeName() + "'"); diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java index 6dbfb0a2312..9f56f7ebc09 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java @@ -38,6 +38,7 @@ public class HttpToHttpsRoutePlannerTest { @Test + @SuppressWarnings("deprecation") void verifyProxyIsDisallowed() { HttpClientContext context = new HttpClientContext(); context.setRequestConfig(RequestConfig.custom().setProxy(new HttpHost("proxy")).build()); 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); diff --git a/parent/pom.xml b/parent/pom.xml index 064d64371a7..612ec7aef19 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1102,8 +1102,8 @@ 4.11.1 4.5.14 4.4.16 - 5.1.4 - 5.1.5 + 5.2.1 + 5.2.1 9.3 diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 17d95a138a5..05b39902d5b 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -97,9 +97,9 @@ org.apache.felix:org.apache.felix.log:1.0.1 org.apache.httpcomponents:httpclient:4.5.14 org.apache.httpcomponents:httpcore:4.4.16 org.apache.httpcomponents:httpmime:4.5.14 -org.apache.httpcomponents.client5:httpclient5:5.1.4 -org.apache.httpcomponents.core5:httpcore5:5.1.5 -org.apache.httpcomponents.core5:httpcore5-h2:5.1.5 +org.apache.httpcomponents.client5:httpclient5:5.2.1 +org.apache.httpcomponents.core5:httpcore5:5.2.1 +org.apache.httpcomponents.core5:httpcore5-h2:5.2.1 org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.6 org.apache.maven:maven-artifact-manager:2.2.1 diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java index 593d93ffe20..3192bb4f225 100644 --- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java +++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java @@ -159,6 +159,7 @@ class ApacheCluster implements Cluster { } + @SuppressWarnings("deprecation") private static CloseableHttpAsyncClient createHttpClient(FeedClientBuilderImpl builder) throws IOException { SSLContext sslContext = builder.constructSslContext(); String[] allowedCiphers = excludeH2Blacklisted(excludeWeak(sslContext.getSupportedSSLParameters().getCipherSuites())); @@ -191,6 +192,7 @@ class ApacheCluster implements Cluster { : url.getPort(); } + @SuppressWarnings("deprecation") private static RequestConfig createRequestConfig(FeedClientBuilderImpl b) { RequestConfig.Builder builder = RequestConfig.custom() .setConnectTimeout(Timeout.ofSeconds(10)) diff --git a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java index 249432804ad..bb4cc91134e 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java @@ -71,6 +71,7 @@ public class FileDistributionStatusClient { System.out.println(parseAndGenerateOutput(json)); } + @SuppressWarnings("deprecation") private String doHttpRequest() { Timeout timeoutInMillis = Timeout.ofMilliseconds((long) (timeout * 1000)); RequestConfig config = custom() -- cgit v1.2.3