diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2023-05-05 12:40:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-05 12:40:43 +0200 |
| commit | 4ee7d2ab29c502e2145fe9eba9747f9720341be4 (patch) | |
| tree | 69ed743a50b6142a7120f31657c7a35f315be687 /parent | |
| parent | 61563ece462c8dc0a6a38f275e7af7907172cddd (diff) | |
| parent | fba3ea069bad515c7fb8ffc9da26aa9e437ca3b0 (diff) | |
Merge branch 'master' into mortent/athenz-1.11.28
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 2701acc218c..71e0c35eb6c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1125,7 +1125,7 @@ <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories --> <athenz.version>1.11.28</athenz.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> - <aws-sdk.version>1.12.331</aws-sdk.version> + <aws-sdk.version>1.12.460</aws-sdk.version> <!-- Athenz END --> <!-- WARNING: If you change curator version, you also need to update @@ -1134,7 +1134,7 @@ find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g' --> - <bouncycastle.version>1.72</bouncycastle.version> + <bouncycastle.version>1.73</bouncycastle.version> <curator.version>5.4.0</curator.version> <commons-codec.version>1.15</commons-codec.version> <commons-io.version>2.11.0</commons-io.version> |