From 94bbdd8e93403d6b02f5ad66686620abc80c0e77 Mon Sep 17 00:00:00 2001
From: Sunny Wu <sunny.wu@thetradedesk.com>
Date: Wed, 1 Apr 2026 17:18:46 +1100
Subject: [PATCH 1/2] UID2-1750: add explicit Lombok dependency to replace
 transitive reliance

uid2-admin uses Lombok annotations (@Getter, @AllArgsConstructor,
lombok.val) but was relying on Lombok being leaked transitively from
uid2-shared's compile-scope dependency. Now that uid2-shared correctly
scopes Lombok as provided+optional, uid2-admin must declare it explicitly.

- Add Lombok 1.18.34 as provided+optional dependency
- Register Lombok as annotationProcessorPath in maven-compiler-plugin

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index a6e03eb58..017f150bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,13 @@
             <artifactId>uid2-shared</artifactId>
             <version>${uid2-shared.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-core</artifactId>
@@ -162,6 +169,13 @@
                     <source>21</source>
                     <target>21</target>
                     <release>21</release>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.34</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>

From e10aaecfcf66aad364649f5234337f8586d55b78 Mon Sep 17 00:00:00 2001
From: Sunny Wu <sunny.wu@thetradedesk.com>
Date: Tue, 7 Apr 2026 15:00:10 +1000
Subject: [PATCH 2/2] Remove redundant optional from lombok dependency

uid2-admin is a leaf project with no downstream consumers, so optional
serves no purpose. Keep provided since lombok is compile-time only.
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 017f150bb..716afdbfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,6 @@
             <artifactId>lombok</artifactId>
             <version>1.18.34</version>
             <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>