From 7872332e839b7a7189775ecacba47147837f9243 Mon Sep 17 00:00:00 2001
From: sophia chen <sophia.chen@thetradedesk.com>
Date: Wed, 3 Jun 2026 13:50:45 +1000
Subject: [PATCH 1/6] UID2-4739: use DefaultCredentialsProvider for KMS client
 in JWTTokenProvider

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/main/java/com/uid2/core/service/JWTTokenProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/uid2/core/service/JWTTokenProvider.java b/src/main/java/com/uid2/core/service/JWTTokenProvider.java
index 16981bd1..38bf6335 100644
--- a/src/main/java/com/uid2/core/service/JWTTokenProvider.java
+++ b/src/main/java/com/uid2/core/service/JWTTokenProvider.java
@@ -16,7 +16,7 @@
 import java.util.function.Supplier;
 
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.WebIdentityTokenFileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.regions.Region;
@@ -154,7 +154,7 @@ private static KmsClient getKmsClient(KmsClientBuilder kmsClientBuilder, JsonObj
                 throw e;
             }
         } else {
-            WebIdentityTokenFileCredentialsProvider credentialsProvider = WebIdentityTokenFileCredentialsProvider.create();
+            DefaultCredentialsProvider credentialsProvider = DefaultCredentialsProvider.create();
 
             client = kmsClientBuilder
                     .region(Region.of(region))

From 04bd670fd7de4beec84ff3baa80922343279ec9a Mon Sep 17 00:00:00 2001
From: sophia chen <sophia.chen@thetradedesk.com>
Date: Tue, 16 Jun 2026 10:19:41 +1000
Subject: [PATCH 2/6] updated shared jar to use DefaultCredentialsProvider

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

diff --git a/pom.xml b/pom.xml
index 46a52e4d..0ce8929b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-        <uid2-shared.version>11.4.16</uid2-shared.version>
+        <uid2-shared.version>11.5.1-alpha-352-SNAPSHOT</uid2-shared.version>
         <netty.version>4.1.133.Final</netty.version>
         <image.version>${project.version}</image.version>
     </properties>

From a12b8b3166a40b8be0259429fc5dd698260e5f63 Mon Sep 17 00:00:00 2001
From: sophia chen <sophia.chen@thetradedesk.com>
Date: Wed, 17 Jun 2026 11:42:08 +1000
Subject: [PATCH 3/6] add lombok dependency

---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1a43947d..a0678f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
         <uid2-shared.version>11.5.1-alpha-352-SNAPSHOT</uid2-shared.version>
+        <lombok.version>1.18.36</lombok.version>
         <netty.version>4.1.135.Final</netty.version>
         <image.version>${project.version}</image.version>
     </properties>
@@ -82,6 +83,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.uid2</groupId>
             <artifactId>uid2-shared</artifactId>
@@ -209,6 +216,13 @@
         <configuration>
           <source>21</source>
           <target>21</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+              <version>${lombok.version}</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>

From c59c0bcc667b9dc74be75d43f7ca8cdb6fe82051 Mon Sep 17 00:00:00 2001
From: sophia chen <sophia.chen@thetradedesk.com>
Date: Wed, 17 Jun 2026 16:30:29 +1000
Subject: [PATCH 4/6] removed use of lombok

---
 pom.xml                                            | 14 --------------
 .../com/uid2/core/service/MetadataProvider.java    |  1 -
 2 files changed, 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0678f88..1a43947d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,6 @@
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
         <uid2-shared.version>11.5.1-alpha-352-SNAPSHOT</uid2-shared.version>
-        <lombok.version>1.18.36</lombok.version>
         <netty.version>4.1.135.Final</netty.version>
         <image.version>${project.version}</image.version>
     </properties>
@@ -83,12 +82,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.uid2</groupId>
             <artifactId>uid2-shared</artifactId>
@@ -216,13 +209,6 @@
         <configuration>
           <source>21</source>
           <target>21</target>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>org.projectlombok</groupId>
-              <artifactId>lombok</artifactId>
-              <version>${lombok.version}</version>
-            </path>
-          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/com/uid2/core/service/MetadataProvider.java b/src/main/java/com/uid2/core/service/MetadataProvider.java
index 14d172df..b8ef3431 100644
--- a/src/main/java/com/uid2/core/service/MetadataProvider.java
+++ b/src/main/java/com/uid2/core/service/MetadataProvider.java
@@ -12,7 +12,6 @@
 
 import static com.uid2.core.util.MetadataHelper.*;
 
-@Getter
 public abstract class MetadataProvider {
     private final ICloudStorage metadataStreamProvider;
     private final ICloudStorage downloadUrlGenerator;

From 43a17bbc919367bda734652ddaf3170b18cb4998 Mon Sep 17 00:00:00 2001
From: sophia chen <sophia.chen@thetradedesk.com>
Date: Wed, 17 Jun 2026 16:32:01 +1000
Subject: [PATCH 5/6] removed lombok import

---
 src/main/java/com/uid2/core/service/MetadataProvider.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/uid2/core/service/MetadataProvider.java b/src/main/java/com/uid2/core/service/MetadataProvider.java
index b8ef3431..1f9d2f54 100644
--- a/src/main/java/com/uid2/core/service/MetadataProvider.java
+++ b/src/main/java/com/uid2/core/service/MetadataProvider.java
@@ -8,7 +8,6 @@
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import lombok.Getter;
 
 import static com.uid2.core.util.MetadataHelper.*;
 

From 48ef46d8a7cb872be20b47b88e84a86768f145bc Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Thu, 18 Jun 2026 00:32:27 +0000
Subject: [PATCH 6/6] [CI Pipeline] Released Snapshot version:
 2.30.128-alpha-186-SNAPSHOT

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

diff --git a/pom.xml b/pom.xml
index 1a43947d..c0dd3d4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.30.127</version>
+    <version>2.30.128-alpha-186-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>