diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-07-06 13:16:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 13:16:26 +0200 |
| commit | 67f953e2974e098c05365d4d45dd66d69254508c (patch) | |
| tree | 1e0b4bc7df27425413de7483b7eb3865bba7f21a /container-core | |
| parent | d8f8be7f46b4faa3339d511bb747e5c44860569e (diff) | |
| parent | 766791025a34e6fad4f692387fd78f038aab0ac2 (diff) | |
Merge pull request #18547 from vespa-engine/bjorncs/apache-http-client-bundle
Bjorncs/apache http client bundle
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/pom.xml | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 2b87d79daa4..c7fe2998530 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -140,10 +140,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> </dependency> @@ -211,6 +207,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-apache-http-client-bundle</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -262,11 +264,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -302,17 +299,6 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.httpcomponents.client5</groupId> - <artifactId>httpclient5</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> <plugins> |