diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-06-22 18:18:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 18:18:20 +0200 |
| commit | afdaaba2a9a6152540b50f2b483a7f908bf0d50e (patch) | |
| tree | 564d99cc9c0e0aa86f297a464647406889abddfe /docker-api | |
| parent | e1bdcefa373fb2c39dfa4143105fdf9bd80636a6 (diff) | |
Revert "Revert "Reapply "Use provided apache http client bundle from container" [run-systemtest]""
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> |