Merge pull request #107 from IABTechLab/ian-UID2-3823-upgrade-java-21

upgrade java 21
IABTechLab · Jul 29, 2024 · 4857964 · 4857964
2 parents a5f3d9e + 41bd1f1
commit 4857964
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
 jobs:
   build:
     uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
+    with:
+      java_version: 21
     secrets: inherit
diff --git a/.github/workflows/release-docker-image.yaml b/.github/workflows/release-docker-image.yaml
@@ -49,6 +49,7 @@ jobs:
     with: 
       release_type: ${{ inputs.release_type }}
       vulnerability_severity: ${{ inputs.vulnerability_severity }}
+      java_version: 21
     secrets: inherit
 
   e2e-test:

diff --git a/.github/workflows/validate-image.yaml b/.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
diff --git a/Dockerfile b/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 8088

diff --git a/pom.xml b/pom.xml
@@ -105,17 +105,23 @@
             <artifactId>loki-logback-appender</artifactId>
             <version>1.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.12</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.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>
@@ -176,7 +182,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <goals>