summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-07-05 20:27:10 +0200
committerGitHub <noreply@github.com>2021-07-05 20:27:10 +0200
commita930310f8558dcb6e235152616d4bdca0970d6e9 (patch)
treedcc7b50672e8386212294f70f1bc6fefe8af2965 /controller-server
parent67525b7bdd587b3546e905f2dd91511b3ede8950 (diff)
Revert "Use provided apache http client bundle from container [run-systemtest]"
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/pom.xml17
1 files changed, 10 insertions, 7 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 3673e3cb9f9..0c05f7d70bb 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -20,13 +20,6 @@
<!-- 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>
@@ -135,6 +128,16 @@
</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>