From 5865dcca9bb427fd265609b4edf80e8fdd30a168 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorn.christian@seime.no>
Date: Wed, 25 Jan 2023 14:55:14 +0100
Subject: Revert "Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)"

This reverts commit 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f.
---
 node-admin/pom.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'node-admin')

diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index 598e0233da0..90bb72efbcd 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -53,6 +53,12 @@
             <artifactId>jackson-annotations</artifactId>
             <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>
@@ -60,15 +66,6 @@
             <artifactId>orchestrator-restapi</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <!-- TODO Use container-apache-http-client-bundle -->
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-- 
cgit v1.2.3