aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-athenz
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-06-22 16:51:03 +0200
committerGitHub <noreply@github.com>2021-06-22 16:51:03 +0200
commitf96b470b6c1370f7a96a34466451b9d7b75f1bfa (patch)
treef10d3b426c0b23604f284a42e725e16940ad54a5 /vespa-athenz
parentf1e78ea463a78209abd0718e460ed4ec02b6f290 (diff)
Revert "Reapply "Use provided apache http client bundle from container" [run-systemtest]"
Diffstat (limited to 'vespa-athenz')
-rw-r--r--vespa-athenz/pom.xml18
1 files changed, 8 insertions, 10 deletions
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index c4dc849a460..90ab2a81e0c 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -25,12 +25,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>security-utils</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -137,6 +131,14 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<exclusions>
@@ -152,10 +154,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>