Bump jjwt, aws-sdk-java and ensure all jackson dependencies follow use same version

4 files changed, 20 insertions, 9 deletions

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
@@ -64,6 +64,11 @@
             <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>
             <version>${project.version}</version>
@@ -189,6 +194,11 @@
         </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>
             <scope>compile</scope>
             <exclusions>
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