diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-06-22 18:49:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-22 18:49:22 +0200 |
commit | 923fa8c4de0e27cda81e9bf8b7ef3d0c916d1954 (patch) | |
tree | 564d99cc9c0e0aa86f297a464647406889abddfe /vespa-athenz/pom.xml | |
parent | e1bdcefa373fb2c39dfa4143105fdf9bd80636a6 (diff) | |
parent | afdaaba2a9a6152540b50f2b483a7f908bf0d50e (diff) |
Merge pull request #18369 from vespa-engine/revert-18367-revert-18366-bjorncs/reapply
Reapply "Use provided apache http client bundle from container" [run-systemtest]"
Diffstat (limited to 'vespa-athenz/pom.xml')
-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> |