summaryrefslogtreecommitdiffstats
path: root/controller-server/pom.xml
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-06-22 16:51:03 +0200
committerGitHub <noreply@github.com>2021-06-22 16:51:03 +0200
commitf96b470b6c1370f7a96a34466451b9d7b75f1bfa (patch)
treef10d3b426c0b23604f284a42e725e16940ad54a5 /controller-server/pom.xml
parentf1e78ea463a78209abd0718e460ed4ec02b6f290 (diff)
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, 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>