From 2ea63e3c9f91411d5155d9403423eff79bef5d5f 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"

This reverts commit 89c9ae74e5aa065981ea55fe326369df64219c6b.
---
 controller-server/pom.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'controller-server')

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>
-- 
cgit v1.2.3