summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-10-19 14:22:55 +0200
committerGitHub <noreply@github.com>2020-10-19 14:22:55 +0200
commitd89ed150a29a758c6e26d8422b7ad69fec4253a1 (patch)
tree3d89e5e41d06a161192436fdb77837d5dac611f3
parentfb6776f5fda4522a1bf210713e8ca574b6d199dd (diff)
parent99d45c25d6cf8c406d5ce7576198548e9afbf99f (diff)
Merge pull request #14944 from vespa-engine/mortent/bump-aws-sdk
Bump aws sdk version to 1.11.879
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml2
-rw-r--r--parent/pom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 8bcea32c988..58f0fd7f109 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -216,7 +216,7 @@
<include>com.yahoo.vespa:vsm:*:jar:test</include>
<!-- 3rd party test dependencies -->
- <include>com.amazonaws:aws-java-sdk-core:1.11.542:jar:test</include>
+ <include>com.amazonaws:aws-java-sdk-core:1.11.879:jar:test</include>
<include>com.auth0:java-jwt:3.10.0:jar:test</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7:jar:test</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[${jackson2.version}]:jar:test</include>
diff --git a/parent/pom.xml b/parent/pom.xml
index a9998af3962..983d8fd3e56 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -752,7 +752,7 @@
<asm.version>7.0</asm.version>
<!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories -->
<athenz.version>1.8.49</athenz.version>
- <aws.sdk.version>1.11.542</aws.sdk.version>
+ <aws.sdk.version>1.11.879</aws.sdk.version>
<!-- WARNING: If you change curator version, you also need to update
zkfacade/src/main/java/org/apache/curator/**/package-info.java
using something like