Updates to Apache HTTP Client 5.

Fixes gh-727, see gh-728

Author: spencergibb

spring-vault-core/pom.xml

@@ -134,14 +134,14 @@
 		<!-- HTTP clients -->
 
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
+			<groupId>org.apache.httpcomponents.core5</groupId>
+			<artifactId>httpcore5</artifactId>
 			<optional>true</optional>
 		</dependency>
 

spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java

@@ -47,13 +47,16 @@
 import okhttp3.OkHttpClient.Builder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.apache.http.impl.conn.DefaultSchemePortResolver;
-import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
+import org.apache.hc.client5.http.ssl.HttpsSupport;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.io.SocketConfig;
 
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -303,22 +306,29 @@ static ClientHttpRequestFactory usingHttpComponents(ClientOptions options, SslCo
 				}
 
 				SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext,
-						enabledProtocols, enabledCipherSuites, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-				httpClientBuilder.setSSLSocketFactory(sslSocketFactory);
-				httpClientBuilder.setSSLContext(sslContext);
+						enabledProtocols, enabledCipherSuites, HttpsSupport.getDefaultHostnameVerifier());
+				PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder //
+						.create().setSSLSocketFactory(sslSocketFactory) //
+						.setDefaultSocketConfig(SocketConfig.custom() //
+								.setSoTimeout(Math.toIntExact(options.getReadTimeout().toMillis()),
+										TimeUnit.MILLISECONDS)
+								.build()) //
+						.build(); //
+				httpClientBuilder.setConnectionManager(connectionManager);
 			}
 
 			RequestConfig requestConfig = RequestConfig.custom()
 					//
-					.setConnectTimeout(Math.toIntExact(options.getConnectionTimeout().toMillis())) //
-					.setSocketTimeout(Math.toIntExact(options.getReadTimeout().toMillis())) //
+					.setConnectTimeout(Math.toIntExact(options.getConnectionTimeout().toMillis()),
+							TimeUnit.MILLISECONDS) //
 					.setAuthenticationEnabled(true) //
 					.build();
 
 			httpClientBuilder.setDefaultRequestConfig(requestConfig);
 
 			// Support redirects
-			httpClientBuilder.setRedirectStrategy(new LaxRedirectStrategy());
+			// TODO: DefaultRedirectStrategy doesn't take method into account
+			// httpClientBuilder.setRedirectStrategy(new LaxRedirectStrategy());
 
 			return new HttpComponentsClientHttpRequestFactory(httpClientBuilder.build());
 		}

spring-vault-dependencies/pom.xml

@@ -57,8 +57,8 @@
 	</licenses>
 
 	<properties>
-		<httpclient.version>4.5.13</httpclient.version>
-		<httpcore.version>4.4.15</httpcore.version>
+		<httpclient.version>5.1.3</httpclient.version>
+		<httpcore.version>5.1.4</httpcore.version>
 		<jetty-reactive-httpclient.version>3.0.6</jetty-reactive-httpclient.version>
 		<netty.version>4.1.79.Final</netty.version>
 		<okhttp3.version>3.14.9</okhttp3.version>
@@ -89,8 +89,8 @@
 
 			<!-- HTTP Client Libraries -->
 			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
+				<groupId>org.apache.httpcomponents.client5</groupId>
+				<artifactId>httpclient5</artifactId>
 				<version>${httpclient.version}</version>
 				<optional>true</optional>
 				<exclusions>
@@ -102,8 +102,8 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
+				<groupId>org.apache.httpcomponents.core5</groupId>
+				<artifactId>httpcore5</artifactId>
 				<version>${httpcore.version}</version>
 				<optional>true</optional>
 			</dependency>