diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-21 10:29:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 10:29:58 +0200 |
| commit | 9a89544b1b33b0a0ef11c2d8e9be37b9b45145cf (patch) | |
| tree | 8fb00f372e5edb3b9d1e6d7df99b2cff44abfed9 /vespa-athenz | |
| parent | 775a3d92d6b8f673b676829dabe6a18d80e3a125 (diff) | |
| parent | 12b22179e17767ec0b27a514e9ec658e431038f8 (diff) | |
Merge pull request #18294 from vespa-engine/bjorncs/apache-http-client-bundle
Package Apache http client libraries as a single osgi bundle [run-systemtest]
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 653eb58d76d..457ab0e3243 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> |