aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/pom.xml
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-06-22 18:18:20 +0200
committerGitHub <noreply@github.com>2021-06-22 18:18:20 +0200
commitafdaaba2a9a6152540b50f2b483a7f908bf0d50e (patch)
tree564d99cc9c0e0aa86f297a464647406889abddfe /controller-server/pom.xml
parente1bdcefa373fb2c39dfa4143105fdf9bd80636a6 (diff)
Revert "Revert "Reapply "Use provided apache http client bundle from container" [run-systemtest]""
Diffstat (limited to 'controller-server/pom.xml')
-rw-r--r--controller-server/pom.xml17
1 files changed, 7 insertions, 10 deletions
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
@@ -20,6 +20,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>
<version>${project.version}</version>
@@ -128,16 +135,6 @@
</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>
<exclusions>