From 716b18a38a62b08ad9ea4f88d95ff952d504b55d Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2023 16:31:09 +0200
Subject: Bump jjwt, aws-sdk-java and ensure all jackson dependencies follow
 use same version

---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'parent')

diff --git a/parent/pom.xml b/parent/pom.xml
index 6b84137b43b..1dc5667f557 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.10.54</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
@@ -1146,7 +1146,7 @@
         <hdrhistogram.version>2.1.12</hdrhistogram.version>
         <jetty.version>11.0.15</jetty.version>
         <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version>
-        <jjwt.version>0.11.2</jjwt.version>
+        <jjwt.version>0.11.5</jjwt.version>
         <jna.version>5.11.0</jna.version>
         <junit.version>5.8.1</junit.version>
         <maven-archiver.version>3.6.0</maven-archiver.version>
-- 
cgit v1.2.3


From a06e457296ed44a62e2eef7ffb15a24b64daeea1 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2023 18:23:18 +0200
Subject: Bump bouncycastle from 1.72 to 1.73

---
 cloud-tenant-base-dependencies-enforcer/pom.xml            | 2 +-
 parent/pom.xml                                             | 2 +-
 vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'parent')

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 13cbe8b91af..0931ad85ad3 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -21,7 +21,7 @@
 
         <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml -->
         <athenz.version>1.10.54</athenz.version>
-        <bouncycastle.version>1.72</bouncycastle.version>
+        <bouncycastle.version>1.73</bouncycastle.version>
         <commons-codec.version>1.15</commons-codec.version>
         <felix.version>7.0.1</felix.version>
         <httpclient5.version>5.2.1</httpclient5.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b84137b43b..5c19ea61e3f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -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>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index d731024f541..44142dd79e9 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -140,9 +140,9 @@ org.apache.zookeeper:zookeeper:3.8.1
 org.apache.zookeeper:zookeeper-jute:3.8.0
 org.apache.zookeeper:zookeeper-jute:3.8.1
 org.apiguardian:apiguardian-api:1.1.2
-org.bouncycastle:bcpkix-jdk18on:1.72
-org.bouncycastle:bcprov-jdk18on:1.72
-org.bouncycastle:bcutil-jdk18on:1.72
+org.bouncycastle:bcpkix-jdk18on:1.73
+org.bouncycastle:bcprov-jdk18on:1.73
+org.bouncycastle:bcutil-jdk18on:1.73
 org.codehaus.plexus:plexus-archiver:4.2.1
 org.codehaus.plexus:plexus-cipher:2.0
 org.codehaus.plexus:plexus-classworlds:2.6.0
-- 
cgit v1.2.3