From 88905ea20d13c674bbc725302abe3607b1550604 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:20:44 +0200 Subject: [PATCH] Upgrade to Apache HttpClient 5.4 This commit also updates the external Javadoc link to avoid the following warning in the build. URL https://hc.apache.org/httpcomponents-client-5.2.x/current/httpclient5/apidocs/package-list was redirected to https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/package-list Closes gh-33587 --- build.gradle | 2 +- framework-platform/framework-platform.gradle | 2 +- .../http/client/HttpComponentsClientHttpRequestFactory.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2891f6ac77..2e8161c940 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configure([rootProject] + javaProjects) { project -> "https://fasterxml.github.io/jackson-core/javadoc/2.14/", "https://fasterxml.github.io/jackson-databind/javadoc/2.14/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.14/", - "https://hc.apache.org/httpcomponents-client-5.2.x/current/httpclient5/apidocs/", + "https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/", "https://projectreactor.io/docs/test/release/api/", "https://junit.org/junit4/javadoc/4.13.2/", // TODO Uncomment link to JUnit 5 docs once we execute Gradle with Java 18+. diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 6e3cf40273..2d80ef0cc9 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -101,7 +101,7 @@ dependencies { api("org.apache.derby:derby:10.16.1.1") api("org.apache.derby:derbyclient:10.16.1.1") api("org.apache.derby:derbytools:10.16.1.1") - api("org.apache.httpcomponents.client5:httpclient5:5.3.1") + api("org.apache.httpcomponents.client5:httpclient5:5.4") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.5") api("org.apache.poi:poi-ooxml:5.2.5") api("org.apache.tomcat.embed:tomcat-embed-core:10.1.28") diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java index d5d73e8f89..c986bc371d 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java @@ -205,6 +205,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest @Override + @SuppressWarnings("deprecation") public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { HttpClient client = getHttpClient();