From cb524a8c9de67cd8810b975c2310552579e24c6e Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Tue, 22 Jun 2021 14:51:11 +0200
Subject: Reapply "Use provided apache http client bundle from container"

---
 athenz-identity-provider-service/pom.xml | 16 ++++++----------
 config/pom.xml                           |  6 ++++++
 configserver-client/pom.xml              |  6 ++++++
 configserver/pom.xml                     |  6 ++++++
 container-core/pom.xml                   | 26 ++++++--------------------
 controller-api/pom.xml                   |  7 +++++++
 controller-server/pom.xml                | 17 +++++++----------
 docker-api/pom.xml                       | 24 ++++++------------------
 filedistribution/pom.xml                 | 10 ++++++----
 http-utils/pom.xml                       |  9 ++++-----
 jdisc-cloud-aws/pom.xml                  | 12 ++++++++++++
 metrics-proxy/pom.xml                    |  6 ++++++
 node-admin/pom.xml                       | 16 ++++++----------
 node-repository/pom.xml                  | 10 ++++++----
 service-monitor/pom.xml                  | 14 ++++++--------
 vespa-athenz/pom.xml                     | 18 ++++++++++--------
 vespaclient-container-plugin/pom.xml     |  5 -----
 17 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml
index 855b3afafaf..3c5f96a1fec 100644
--- a/athenz-identity-provider-service/pom.xml
+++ b/athenz-identity-provider-service/pom.xml
@@ -26,6 +26,12 @@
             <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>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>container-dev</artifactId>
@@ -79,16 +85,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- COMPILE -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-
         <!-- TEST -->
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
diff --git a/config/pom.xml b/config/pom.xml
index 6e4e26ed0f1..8355587c10b 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -14,6 +14,12 @@
   <version>7-SNAPSHOT</version>
   <dependencies>
     <!-- provided scope -->
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>container-apache-http-client-bundle</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/configserver-client/pom.xml b/configserver-client/pom.xml
index 0a29ba003f4..39005c9ccab 100644
--- a/configserver-client/pom.xml
+++ b/configserver-client/pom.xml
@@ -28,6 +28,12 @@
             <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>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>security-utils</artifactId>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 3b7fef085b1..a237d7e00ad 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -141,6 +141,12 @@
       <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>
     <dependency>
       <!-- To get all necessary test deps. -->
       <groupId>com.yahoo.vespa</groupId>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 2b87d79daa4..c7fe2998530 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -139,10 +139,6 @@
       <artifactId>vespalog</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>
@@ -209,6 +205,12 @@
       <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>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>defaults</artifactId>
@@ -261,11 +263,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -302,17 +299,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/controller-api/pom.xml b/controller-api/pom.xml
index 2f01f45edaa..02a7028b8ca 100644
--- a/controller-api/pom.xml
+++ b/controller-api/pom.xml
@@ -25,6 +25,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>serviceview</artifactId>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 0c05f7d70bb..3673e3cb9f9 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -19,6 +19,13 @@
 
         <!-- provided -->
 
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>controller-api</artifactId>
@@ -127,16 +134,6 @@
             <version>1.3.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index 749eca97c53..7de2d502dc3 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -31,6 +31,12 @@
             <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>
@@ -93,24 +99,6 @@
                 </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>
diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml
index 8bfa85d8b16..e922d878dd7 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -18,6 +18,12 @@
     <name>${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>vespajlib</artifactId>
@@ -57,10 +63,6 @@
             <groupId>io.airlift</groupId>
             <artifactId>airline</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/http-utils/pom.xml b/http-utils/pom.xml
index 1f85658430f..2a8ec1b9bb9 100644
--- a/http-utils/pom.xml
+++ b/http-utils/pom.xml
@@ -31,22 +31,21 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
-
-    <!-- compile scope -->
+    <!-- Apache client artifacts are provided by the jdisc container and are therefore scoped as such -->
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
index 9f4572736c8..0c89872aa46 100644
--- a/jdisc-cloud-aws/pom.xml
+++ b/jdisc-cloud-aws/pom.xml
@@ -23,9 +23,21 @@
             <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>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml
index a7579aeb2ea..19b545df616 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -58,6 +58,12 @@
       <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>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-core</artifactId>
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index 52873501744..5d3bdb6207c 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -19,6 +19,12 @@
 
     <dependencies>
         <!-- Provided -->
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>docker-api</artifactId>
@@ -67,16 +73,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
diff --git a/node-repository/pom.xml b/node-repository/pom.xml
index 30aa76658fd..e7fdc560bc5 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -24,6 +24,12 @@
             <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>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>config-provisioning</artifactId>
@@ -78,10 +84,6 @@
             <version>6.0.3</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>http-utils</artifactId>
diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index 578fcc83006..df28737f352 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -16,14 +16,6 @@
     <description>Service monitor component for hosted vespa.</description>
 
     <dependencies>
-        <!-- compile scope -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5</version>
-            <!-- This is necessary to get 4.4's HostnameVerifier API of SSLConnectionSocketFactory::new -->
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>http-utils</artifactId>
@@ -32,6 +24,12 @@
         </dependency>
 
         <!-- provided scope -->
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>config</artifactId>
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 90ab2a81e0c..c4dc849a460 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -23,6 +23,12 @@
             <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>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>security-utils</artifactId>
@@ -130,14 +136,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
@@ -154,6 +152,10 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml
index 834c3d7c988..17443b11b6a 100644
--- a/vespaclient-container-plugin/pom.xml
+++ b/vespaclient-container-plugin/pom.xml
@@ -37,11 +37,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespa-http-client</artifactId>
-- 
cgit v1.2.3