diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-06-22 21:36:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-22 21:36:13 +0200 |
commit | 71da30eb909cecf7c0a6cd158e25db2cad2085d7 (patch) | |
tree | 3801d3abbcbe3ae5497b3b21d18e0017e7cf1b6c /docker-api/pom.xml | |
parent | 923fa8c4de0e27cda81e9bf8b7ef3d0c916d1954 (diff) |
Revert "Reapply "Use provided apache http client bundle from container" [run-systemtest]""
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> |