diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-21 10:29:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 10:29:58 +0200 |
| commit | 9a89544b1b33b0a0ef11c2d8e9be37b9b45145cf (patch) | |
| tree | 8fb00f372e5edb3b9d1e6d7df99b2cff44abfed9 /docker-api/pom.xml | |
| parent | 775a3d92d6b8f673b676829dabe6a18d80e3a125 (diff) | |
| parent | 12b22179e17767ec0b27a514e9ec658e431038f8 (diff) | |
Merge pull request #18294 from vespa-engine/bjorncs/apache-http-client-bundle
Package Apache http client libraries as a single osgi bundle [run-systemtest]
Diffstat (limited to 'docker-api/pom.xml')
| -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> |