diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 14:51:11 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 14:53:20 +0200 |
commit | 2ea63e3c9f91411d5155d9403423eff79bef5d5f (patch) | |
tree | bb40579e1352819ccd5202035f2b891b4fb3f623 /docker-api | |
parent | d0adc4b2bcaaefb063b83e441376ef0c07f57a84 (diff) |
Reapply "Use provided apache http client bundle from container"
This reverts commit 89c9ae74e5aa065981ea55fe326369df64219c6b.
Diffstat (limited to 'docker-api')
-rw-r--r-- | docker-api/pom.xml | 24 |
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> |