summaryrefslogtreecommitdiffstats
path: root/jdisc-cloud-aws
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-06-22 13:01:17 +0200
committerGitHub <noreply@github.com>2021-06-22 13:01:17 +0200
commitd0adc4b2bcaaefb063b83e441376ef0c07f57a84 (patch)
treedbb500fef8c9403dcfedf43f00132ec76f4c8baa /jdisc-cloud-aws
parent120d872163ddaedb7ea0b0c8a335e7c784c86ff7 (diff)
parent89c9ae74e5aa065981ea55fe326369df64219c6b (diff)
Merge pull request #18362 from vespa-engine/bjorncs/revert
Revert "Use provided apache http client bundle from container" [run-systemtest] MERGEOK
Diffstat (limited to 'jdisc-cloud-aws')
-rw-r--r--jdisc-cloud-aws/pom.xml12
1 files changed, 0 insertions, 12 deletions
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
index 0c89872aa46..9f4572736c8 100644
--- a/jdisc-cloud-aws/pom.xml
+++ b/jdisc-cloud-aws/pom.xml
@@ -24,20 +24,8 @@
<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>