diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-06-22 16:51:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 16:51:03 +0200 |
| commit | f96b470b6c1370f7a96a34466451b9d7b75f1bfa (patch) | |
| tree | f10d3b426c0b23604f284a42e725e16940ad54a5 /container-core | |
| parent | f1e78ea463a78209abd0718e460ed4ec02b6f290 (diff) | |
Revert "Reapply "Use provided apache http client bundle from container" [run-systemtest]"
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> |