aboutsummaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-16 16:59:40 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-17 13:16:31 +0200
commita181d8d9de3f4e73daab9ee0d62fd25f094fce2f (patch)
tree782a018797efcf657e723901edcc89b2f9602250 /docker-api
parent83357d0efbdf5426b65bf4aad7483e2b6a3bb1a6 (diff)
Use provided apache http client bundle from container
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/pom.xml24
1 files changed, 6 insertions, 18 deletions
diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index 749eca97c53..7de2d502dc3 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -31,6 +31,12 @@
<version>${project.version}</version>
<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>
@@ -93,24 +99,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <!-- We explicitly specify the version of httpcore to be used by
- docker-java so the dependency is declared closer to the root of maven and
- more likely be the version that is finally being used. -->
- <version>4.4.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <!-- We explicitly specify the version of httpclient to be used by
- docker-java so the dependency is declared closer to the root of maven and
- more likely be the version that is finally being used. -->
- <version>4.5</version>
- <scope>compile</scope>
- </dependency>
<!-- Test -->
<dependency>