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

---
 service-monitor/pom.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'service-monitor/pom.xml')

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