diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-06-22 13:01:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 13:01:17 +0200 |
| commit | d0adc4b2bcaaefb063b83e441376ef0c07f57a84 (patch) | |
| tree | dbb500fef8c9403dcfedf43f00132ec76f4c8baa /docker-api/pom.xml | |
| parent | 120d872163ddaedb7ea0b0c8a335e7c784c86ff7 (diff) | |
| parent | 89c9ae74e5aa065981ea55fe326369df64219c6b (diff) | |
Merge pull request #18362 from vespa-engine/bjorncs/revert
Revert "Use provided apache http client bundle from container" [run-systemtest] MERGEOK
Diffstat (limited to 'docker-api/pom.xml')
| -rw-r--r-- | docker-api/pom.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 7de2d502dc3..749eca97c53 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -31,12 +31,6 @@ <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> @@ -99,6 +93,24 @@ </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> |