Revert "Bjorncs/upgrade httpclient5"

1 files changed, 5 insertions, 4 deletions

diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 0dec711f4c0..5056cf91d79 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -35,8 +35,8 @@ import com.yahoo.security.SslContextBuilder;
 import com.yahoo.security.X509CertificateBuilder;
 import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.security.tls.TlsContext;
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequests;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
-import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.entity.mime.FormBodyPart;
 import org.apache.hc.client5.http.entity.mime.FormBodyPartBuilder;
 import org.apache.hc.client5.http.entity.mime.StringBody;
@@ -523,9 +523,9 @@ public class HttpServerTest {
         MetricConsumerMock metricConsumer = new MetricConsumerMock();
         InMemoryConnectionLog connectionLog = new InMemoryConnectionLog();
         JettyTestDriver driver = createSslTestDriver(certificateFile, privateKeyFile, metricConsumer, connectionLog);
-        try (CloseableHttpAsyncClient client = createHttp2Client(driver)) {
+        try (CloseableHttpAsyncClient client = createHttp2Client(certificateFile, privateKeyFile)) {
             String uri = "https://localhost:" + driver.server().getListenPort() + "/status.html";
-            SimpleHttpResponse response = client.execute(SimpleRequestBuilder.get(uri).build(), null).get();
+            SimpleHttpResponse response = client.execute(SimpleHttpRequests.get(uri), null).get();
             assertNull(response.getBodyText());
             assertEquals(OK, response.getCode());
         }
@@ -967,7 +967,8 @@ public class HttpServerTest {
         return client;
     }
 
-    private static CloseableHttpAsyncClient createHttp2Client(JettyTestDriver driver) {
+    private static CloseableHttpAsyncClient createHttp2Client(Path certificateFile, Path privateKeyFile) {
+        JettyTestDriver driver = JettyTestDriver.newInstanceWithSsl(new EchoRequestHandler(), certificateFile, privateKeyFile, TlsClientAuth.WANT);
         TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
                 .setSslContext(driver.sslContext())
                 .build();