diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 12:56:20 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 12:56:20 +0200 |
| commit | 89c9ae74e5aa065981ea55fe326369df64219c6b (patch) | |
| tree | dbb500fef8c9403dcfedf43f00132ec76f4c8baa /container-core | |
| parent | 120d872163ddaedb7ea0b0c8a335e7c784c86ff7 (diff) | |
Revert "Use provided apache http client bundle from container"
This reverts commit a181d8d9de3f4e73daab9ee0d62fd25f094fce2f.
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/pom.xml | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index c7fe2998530..2b87d79daa4 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -140,6 +140,10 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> </dependency> @@ -207,12 +211,6 @@ </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> @@ -264,6 +262,11 @@ <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> @@ -299,6 +302,17 @@ <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> |