From 8fbabfb2949fb90088aa79c3100a2acdd919ea21 Mon Sep 17 00:00:00 2001
From: "ian.nara" <ian.nara@thetradedesk.com>
Date: Thu, 25 Jul 2024 13:30:18 -0600
Subject: [PATCH 1/6] upgrade java 21

---
 .github/workflows/build-and-test.yaml       | 2 ++
 .github/workflows/release-docker-image.yaml | 1 +
 .github/workflows/validate-image.yaml       | 1 +
 Dockerfile                                  | 4 ++--
 pom.xml                                     | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 4aad7e5..00695f1 100644
--- 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
\ No newline at end of file
diff --git a/.github/workflows/release-docker-image.yaml b/.github/workflows/release-docker-image.yaml
index 12d0433..77f8b07 100644
--- 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
index 9e380da..8ae78d5 100644
--- 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
index 4ca3db8..679edab 100644
--- 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
index 44ca52d..3dccde3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>

From 994c5e5682e562c35c73d19b333bdfcf5dd4eb55 Mon Sep 17 00:00:00 2001
From: "ian.nara" <ian.nara@thetradedesk.com>
Date: Thu, 25 Jul 2024 13:37:41 -0600
Subject: [PATCH 2/6] pom.xml updates

---
 pom.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3dccde3..d6e9d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,9 @@
         <micrometer.version>1.1.0</micrometer.version>
         <uid2-shared.version>7.7.6-1e644a0ded</uid2-shared.version>
         <image.version>${project.version}</image.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <java.version>21</java.version>
     </properties>
 
     <repositories>
@@ -105,6 +108,11 @@
             <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>
@@ -112,10 +120,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>21</source>
                     <target>21</target>
+                    <release>21</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -176,7 +185,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <goals>

From 6e06e72f393ca54fa8e92c67c1aa783c994806cc Mon Sep 17 00:00:00 2001
From: "ian.nara" <ian.nara@thetradedesk.com>
Date: Thu, 25 Jul 2024 13:42:23 -0600
Subject: [PATCH 3/6] remove unneeded properties

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d6e9d38..e75934d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,9 +18,6 @@
         <micrometer.version>1.1.0</micrometer.version>
         <uid2-shared.version>7.7.6-1e644a0ded</uid2-shared.version>
         <image.version>${project.version}</image.version>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <java.version>21</java.version>
     </properties>
 
     <repositories>

From fb424995f6cc645a87bf34ee21daccb00bb29c85 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Thu, 25 Jul 2024 19:42:50 +0000
Subject: [PATCH 4/6] [CI Pipeline] Released Snapshot version:
 2.10.1-alpha-29-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e75934d..95bbc9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.10.0</version>
+    <version>2.10.1-alpha-29-SNAPSHOT</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>

From 5d6126ab270cae8210678718c19dc9f7ebbd7697 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Thu, 25 Jul 2024 19:49:56 +0000
Subject: [PATCH 5/6] [CI Pipeline] Released Snapshot version:
 2.10.2-alpha-30-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95bbc9f..54b22cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.10.1-alpha-29-SNAPSHOT</version>
+    <version>2.10.2-alpha-30-SNAPSHOT</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>

From 41bd1f1782c7085517828ec0ef6e0170ae94dea3 Mon Sep 17 00:00:00 2001
From: "ian.nara" <ian.nara@thetradedesk.com>
Date: Thu, 25 Jul 2024 13:56:12 -0600
Subject: [PATCH 6/6] reset version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54b22cb..e75934d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.10.2-alpha-30-SNAPSHOT</version>
+    <version>2.10.0</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>