summaryrefslogtreecommitdiffstats
path: root/controller-server/pom.xml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-22 14:51:11 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-22 14:53:20 +0200
commit2ea63e3c9f91411d5155d9403423eff79bef5d5f (patch)
treebb40579e1352819ccd5202035f2b891b4fb3f623 /controller-server/pom.xml
parentd0adc4b2bcaaefb063b83e441376ef0c07f57a84 (diff)
Reapply "Use provided apache http client bundle from container"
This reverts commit 89c9ae74e5aa065981ea55fe326369df64219c6b.
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>