Upgrade Apache httpclient+httpcore to newest version

Use deprecated setSslcontext() in code that may run
outside JDisc.

1 files changed, 9 insertions, 2 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
index 0e7488c8927..f59d4a4bbba 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
@@ -23,6 +23,7 @@ import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
 
+import javax.net.ssl.SSLContext;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -413,7 +414,7 @@ class ApacheGatewayConnection implements GatewayConnection {
             } else {
                 clientBuilder = HttpClientBuilder.create();
                 if (connectionParams.getSslContext() != null) {
-                    clientBuilder.setSslcontext(connectionParams.getSslContext());
+                    setSslContext(clientBuilder, connectionParams.getSslContext());
                 } else {
                     SslContextBuilder builder = new SslContextBuilder();
                     if (connectionParams.getPrivateKey() != null && connectionParams.getCertificate() != null) {
@@ -422,7 +423,7 @@ class ApacheGatewayConnection implements GatewayConnection {
                     if (connectionParams.getCaCertificates() != null) {
                         builder.withTrustStore(connectionParams.getCaCertificates());
                     }
-                    clientBuilder.setSslcontext(builder.build());
+                    setSslContext(clientBuilder, builder.build());
                 }
                 if (connectionParams.getHostnameVerifier() != null) {
                     clientBuilder.setSSLHostnameVerifier(connectionParams.getHostnameVerifier());
@@ -454,4 +455,10 @@ class ApacheGatewayConnection implements GatewayConnection {
         }
     }
 
+    // Note: Using deprecated setSslcontext() to allow httpclient 4.4 on classpath (e.g unexpected Maven dependency resolution for test classpath)
+    @SuppressWarnings("deprecation")
+    private static void setSslContext(HttpClientBuilder builder, SSLContext sslContext) {
+        builder.setSslcontext(sslContext);
+    }
+
 }