From dd2a716ef9480e3b673955fcded3573dd6b5f633 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2023 13:38:47 +0200
Subject: Bump jackson from 2.14.2 to 2.15.0

---
 .../allowed-maven-dependencies.txt                     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'vespa-dependencies-enforcer')

diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 1c2db273653..d731024f541 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -14,15 +14,15 @@ com.amazonaws:aws-java-sdk-ssm:1.12.331
 com.amazonaws:aws-java-sdk-sts:1.12.331
 com.amazonaws:jmespath-java:1.12.331
 com.auth0:java-jwt:3.10.0
-com.fasterxml.jackson.core:jackson-annotations:2.14.2
-com.fasterxml.jackson.core:jackson-core:2.14.2
-com.fasterxml.jackson.core:jackson-databind:2.14.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.2
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.2
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.2
+com.fasterxml.jackson.core:jackson-annotations:2.15.0
+com.fasterxml.jackson.core:jackson-core:2.15.0
+com.fasterxml.jackson.core:jackson-databind:2.15.0
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.0
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.0
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.0
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.0
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.0
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.0
 com.github.spotbugs:spotbugs-annotations:3.1.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.18.0
-- 
cgit v1.2.3


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

---
 hosted-tenant-base/pom.xml                                 |  1 +
 parent/pom.xml                                             |  4 ++--
 vespa-athenz/pom.xml                                       | 10 ++++++++++
 vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 14 +++++++-------
 4 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'vespa-dependencies-enforcer')

diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index bce3a7dc703..289854173c3 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -37,6 +37,7 @@
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+        <jackson2.version>2.15.0</jackson2.version>
         <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' -->
         <vespa.junit.version>5.8.1</vespa.junit.version>
         <test.categories>!integration</test.categories>
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>
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 29a4058e180..788dc4448f6 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -63,6 +63,11 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-cbor</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>vespajlib</artifactId>
@@ -187,6 +192,11 @@
             <artifactId>jjwt-impl</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency> <!-- needed by auth-core -->
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency> <!-- needed by auth-core -->
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index d731024f541..5822b90d9e7 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -9,10 +9,10 @@ backport-util-concurrent:backport-util-concurrent:3.1
 ch.qos.logback:logback-classic:1.2.10
 ch.qos.logback:logback-core:1.2.10
 classworlds:classworlds:1.1-alpha-2
-com.amazonaws:aws-java-sdk-core:1.12.331
-com.amazonaws:aws-java-sdk-ssm:1.12.331
-com.amazonaws:aws-java-sdk-sts:1.12.331
-com.amazonaws:jmespath-java:1.12.331
+com.amazonaws:aws-java-sdk-core:1.12.460
+com.amazonaws:aws-java-sdk-ssm:1.12.460
+com.amazonaws:aws-java-sdk-sts:1.12.460
+com.amazonaws:jmespath-java:1.12.460
 com.auth0:java-jwt:3.10.0
 com.fasterxml.jackson.core:jackson-annotations:2.15.0
 com.fasterxml.jackson.core:jackson-core:2.15.0
@@ -61,9 +61,9 @@ commons-io:commons-io:2.11.0
 commons-logging:commons-logging:1.2
 io.airlift:airline:0.9
 io.dropwizard.metrics:metrics-core:3.2.5
-io.jsonwebtoken:jjwt-api:0.11.2
-io.jsonwebtoken:jjwt-impl:0.11.2
-io.jsonwebtoken:jjwt-jackson:0.11.2
+io.jsonwebtoken:jjwt-api:0.11.5
+io.jsonwebtoken:jjwt-impl:0.11.5
+io.jsonwebtoken:jjwt-jackson:0.11.5
 io.netty:netty-buffer:4.1.86.Final
 io.netty:netty-codec:4.1.86.Final
 io.netty:netty-common:4.1.86.Final
-- 
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 'vespa-dependencies-enforcer')

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