From 71da30eb909cecf7c0a6cd158e25db2cad2085d7 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Tue, 22 Jun 2021 21:36:13 +0200
Subject: Revert "Reapply "Use provided apache http client bundle from
 container" [run-systemtest]""

---
 docker-api/pom.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'docker-api/pom.xml')

diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index 7de2d502dc3..749eca97c53 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -31,12 +31,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>container-apache-http-client-bundle</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Compile -->
         <dependency>
@@ -99,6 +93,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <!-- We explicitly specify the version of httpcore to be used by
+            docker-java so the dependency is declared closer to the root of maven and
+            more likely be the version that is finally being used. -->
+            <version>4.4.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+             <!-- We explicitly specify the version of httpclient to be used by
+            docker-java so the dependency is declared closer to the root of maven and
+            more likely be the version that is finally being used. -->
+            <version>4.5</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- Test -->
         <dependency>
-- 
cgit v1.2.3