From d759d6be7a3ff383a998759377fe969917a658e7 Mon Sep 17 00:00:00 2001
From: Eric Wittmann <eric.wittmann@gmail.com>
Date: Tue, 27 Aug 2024 14:19:08 -0400
Subject: [PATCH] Fix lombok scope in 2.6.x (#5084)

* Ensure lombok is provided scope

* Add lombok to integration-tests
---
 app/pom.xml                                  | 2 +-
 common/pom.xml                               | 2 +-
 examples/debezium-openshift/pom.xml          | 1 +
 examples/tools/kafkasql-topic-import/pom.xml | 1 +
 integration-tests/pom.xml                    | 8 +++++++-
 pom.xml                                      | 1 +
 schema-util/common/pom.xml                   | 2 +-
 schema-util/json/pom.xml                     | 2 +-
 schema-util/protobuf/pom.xml                 | 8 +++++++-
 9 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index 9a52d34db0..85e2bd15e8 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -176,7 +176,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 559b591d48..2e2ed66b54 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/examples/debezium-openshift/pom.xml b/examples/debezium-openshift/pom.xml
index ed13ac7d15..1e738fa5bb 100644
--- a/examples/debezium-openshift/pom.xml
+++ b/examples/debezium-openshift/pom.xml
@@ -70,6 +70,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>
diff --git a/examples/tools/kafkasql-topic-import/pom.xml b/examples/tools/kafkasql-topic-import/pom.xml
index 58d52b7476..eb5d509d64 100644
--- a/examples/tools/kafkasql-topic-import/pom.xml
+++ b/examples/tools/kafkasql-topic-import/pom.xml
@@ -18,6 +18,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.28</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f921226100..86b0a013eb 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -55,6 +55,13 @@
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-client</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-tenant-manager-client</artifactId>
@@ -96,7 +103,6 @@
             <artifactId>apicurio-registry-utils-converter</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Test Only -->
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
diff --git a/pom.xml b/pom.xml
index 1de35ef7f6..53df8f43f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,6 +628,7 @@
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.santuario</groupId>
diff --git a/schema-util/common/pom.xml b/schema-util/common/pom.xml
index e29da383a6..2507412fea 100644
--- a/schema-util/common/pom.xml
+++ b/schema-util/common/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/schema-util/json/pom.xml b/schema-util/json/pom.xml
index bb55c01ffc..a0e0ac74b7 100644
--- a/schema-util/json/pom.xml
+++ b/schema-util/json/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/schema-util/protobuf/pom.xml b/schema-util/protobuf/pom.xml
index b769ad1c2d..1358a6df7e 100644
--- a/schema-util/protobuf/pom.xml
+++ b/schema-util/protobuf/pom.xml
@@ -25,7 +25,13 @@
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-protobuf-schema-utilities</artifactId>
         </dependency>
-    
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>