diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 14:51:11 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-23 08:07:55 +0200 |
| commit | cb524a8c9de67cd8810b975c2310552579e24c6e (patch) | |
| tree | c61e49df6eb0204233eb40fe1d10957e0a786f6d /vespa-athenz | |
| parent | 79831782255e2b362c9d650ec5c7c8398b2a4eff (diff) | |
Reapply "Use provided apache http client bundle from container"
Diffstat (limited to 'vespa-athenz')
| -rw-r--r-- | vespa-athenz/pom.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 90ab2a81e0c..c4dc849a460 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -25,6 +25,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>security-utils</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -131,14 +137,6 @@ </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> @@ -154,6 +152,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |