summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2023-01-25 14:55:14 +0100
committerGitHub <noreply@github.com>2023-01-25 14:55:14 +0100
commit5865dcca9bb427fd265609b4edf80e8fdd30a168 (patch)
treea6b2b2e167023c6c456347ee8eeaccbcdf634081 /node-admin
parent904dd2bd8e3a19d4552719ca52baa427d511fcde (diff)
Revert "Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)"
This reverts commit 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f.
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/pom.xml15
1 files changed, 6 insertions, 9 deletions
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>
@@ -61,15 +67,6 @@
<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>
<exclusions>