summaryrefslogtreecommitdiffstats
path: root/jdisc-cloud-aws
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-22 14:51:11 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-22 14:53:20 +0200
commit2ea63e3c9f91411d5155d9403423eff79bef5d5f (patch)
treebb40579e1352819ccd5202035f2b891b4fb3f623 /jdisc-cloud-aws
parentd0adc4b2bcaaefb063b83e441376ef0c07f57a84 (diff)
Reapply "Use provided apache http client bundle from container"
This reverts commit 89c9ae74e5aa065981ea55fe326369df64219c6b.
Diffstat (limited to 'jdisc-cloud-aws')
-rw-r--r--jdisc-cloud-aws/pom.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
index 9f4572736c8..0c89872aa46 100644
--- a/jdisc-cloud-aws/pom.xml
+++ b/jdisc-cloud-aws/pom.xml
@@ -24,8 +24,20 @@
<scope>provided</scope>
</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.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>