Merge branch '4.0.x'

Closes gh-1494

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java

@@ -200,6 +200,7 @@ public boolean isSingleton() {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public CloseableHttpClient getObject() throws Exception {
 
 		PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder
@@ -218,7 +219,7 @@ public CloseableHttpClient getObject() throws Exception {
 		applyMaxConnectionsPerHost(this.connectionManager);
 
 		RequestConfig.Builder requestConfigBuilder = RequestConfig.custom() //
-			.setConnectionRequestTimeout(Timeout.of(this.connectionTimeout)) //
+			.setConnectTimeout(Timeout.of(this.connectionTimeout)) //
 			.setResponseTimeout(Timeout.of(this.readTimeout));
 
 		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create() //