Merge pull request #324 from IABTechLab/tjm-UID2-3790-java-21

Upgrade to Java 21

Author: thomasm-ttd

.github/workflows/build-and-test.yaml

@@ -5,3 +5,5 @@ jobs:
   build:
     uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
     secrets: inherit
+    with:
+      java_version: 21

.github/workflows/release-docker-image.yaml

@@ -25,4 +25,5 @@ jobs:
     with: 
       release_type: ${{ inputs.release_type }}
       vulnerability_severity: ${{ inputs.vulnerability_severity }}
+      java_version: 21
     secrets: inherit

.github/workflows/validate-image.yaml

@@ -23,4 +23,5 @@ jobs:
     with: 
       failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
       fail_on_error: ${{ inputs.fail_on_error || true }}
+      java_version: 21
     secrets: inherit

Dockerfile

@@ -1,5 +1,5 @@
-# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/11.0.22_7-jre-alpine/images/sha256-d7a82981336958683f147f17396fe2219cb1072a5853e8a8ef16d07f0535343a?context=explore
-FROM eclipse-temurin@sha256:564eb67091b2cda82952299b4be52bf1b039289234b52f46057fe1286c173b71
+# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/21.0.3_9-jre-alpine/images/sha256-3c40389d278c7129d9032c5f3ce68fb150c2869b5e107ea801b150a2ae653253?context=explore
+FROM eclipse-temurin@sha256:3c40389d278c7129d9032c5f3ce68fb150c2869b5e107ea801b150a2ae653253
 
 WORKDIR /app
 EXPOSE 8089

pom.xml

@@ -6,18 +6,18 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-admin</artifactId>
-    <version>5.11.0</version>
+    <version>5.11.1-alpha-83-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx.version>4.5.3</vertx.version>
         <vertx-maven-plugin.version>1.0.22</vertx-maven-plugin.version>
         <vertx.verticle>com.uid2.admin.vertx.AdminVerticle</vertx.verticle>
         <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
-        <micrometer.version>1.1.0</micrometer.version>
-        <junit-jupiter.version>5.7.0</junit-jupiter.version>
+        <micrometer.version>1.12.2</micrometer.version>
+        <junit-jupiter.version>5.10.3</junit-jupiter.version>
         <uid2-shared.version>7.16.0</uid2-shared.version>
-        <okta-jwt.version>0.5.8</okta-jwt.version>
+        <okta-jwt.version>0.5.9</okta-jwt.version>
         <image.version>${project.version}</image.version>
     </properties>
     <repositories>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>33.2.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.uid2</groupId>
@@ -87,17 +87,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.14.2</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.12</version>
+            <version>1.5.6</version>
         </dependency>
         <dependency>
             <groupId>com.github.loki4j</groupId>
             <artifactId>loki-logback-appender</artifactId>
-            <version>1.2.0</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>3.7.7</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -126,13 +126,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.26.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.instancio</groupId>
             <artifactId>instancio-junit</artifactId>
-            <version>2.11.0</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,10 +154,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.12.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>21</source>
+                    <target>21</target>
+                    <release>21</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -209,7 +210,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <goals>

src/test/java/com/uid2/admin/managers/S3KeyManagerTest.java

@@ -283,7 +283,7 @@ void testCountKeysForSite() {
         testKeys.put(3, new S3Key(3, 2, 1200L, 1100L, "key3"));
         testKeys.put(4, new S3Key(4, 1, 1300L, 1200L, "key4"));
 
-        when(s3KeyManager.getAllS3Keys()).thenReturn(testKeys);
+        when(s3KeyProvider.getAll()).thenReturn(testKeys);
 
         int countForSite1 = s3KeyManager.countKeysForSite(1);
         int countForSite2 = s3KeyManager.countKeysForSite(2);

src/test/java/com/uid2/admin/v2Router/RouterConfigurationTest.java

@@ -40,7 +40,7 @@ void setup() {
         MockitoAnnotations.openMocks(this);
         when(routerMock.route(anyString())).thenReturn(routeMock);
         when(subrouterMock.route(any(), anyString())).thenReturn(routeMock);
-        when(authMiddlewareMock.handle(any(), any())).thenReturn(handlerMock);
+        when(authMiddlewareMock.handle(any(), any(Role[].class))).thenReturn(handlerMock);
     }
     @Test
     public void WhenANonBlockingRouteProviderIsUsed_ItIsRegisteredCorrectly() {