Fixes #247 (#248)

* Move lombok scope from compile to provided * Remove lombok-utils as it doesn't exist in newer versions anymore
awslabs · Mar 8, 2023 · c1da66a · c1da66a
1 parent c77e70c
commit c1da66a
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 16 deletions.
diff --git a/avro-flink-serde/pom.xml b/avro-flink-serde/pom.xml
@@ -68,6 +68,12 @@
             <artifactId>schema-registry-serde</artifactId>
             <version>1.1.15</version>
         </dependency>
+        <dependency>
+          <groupId>org.projectlombok</groupId>
+          <artifactId>lombok</artifactId>
+          <version>1.18.26</version>
+          <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>software.amazon.glue</groupId>

diff --git a/avro-kafkaconnect-converter/pom.xml b/avro-kafkaconnect-converter/pom.xml
@@ -69,6 +69,10 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>connect-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -109,10 +109,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-utils</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -77,10 +77,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-utils</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -71,6 +71,10 @@
             <artifactId>schema-registry-kafkastreams-serde</artifactId>
             <version>${parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kinesis</artifactId>

diff --git a/jsonschema-kafkaconnect-converter/pom.xml b/jsonschema-kafkaconnect-converter/pom.xml
@@ -65,6 +65,10 @@
             <artifactId>schema-registry-serde</artifactId>
             <version>${parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>connect-api</artifactId>

diff --git a/kafkastreams-serde/pom.xml b/kafkastreams-serde/pom.xml
@@ -65,6 +65,10 @@
             <artifactId>schema-registry-serde</artifactId>
             <version>${parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -102,8 +102,7 @@
         <log4j.version>2.17.1</log4j.version>
         <jupiter.version>5.6.2</jupiter.version>
         <mockito.version>3.3.3</mockito.version>
-        <lombok.version>1.18.20</lombok.version>
-        <lombok.utils.version>1.18.12</lombok.utils.version>
+        <lombok.version>1.18.26</lombok.version>
         <hamcrest.version>1.1</hamcrest.version>
         <!--  LATEST KCL Does not work with LocalStack yet, remove once new version works -->
         <kinesis.client.version>2.2.9</kinesis.client.version>
@@ -236,11 +235,7 @@
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok-utils</artifactId>
-                <version>${lombok.utils.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>com.kjetland</groupId>

diff --git a/protobuf-kafkaconnect-converter/pom.xml b/protobuf-kafkaconnect-converter/pom.xml
@@ -66,7 +66,10 @@
             <artifactId>schema-registry-serde</artifactId>
             <version>${parent.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>connect-api</artifactId>

diff --git a/serializer-deserializer/pom.xml b/serializer-deserializer/pom.xml
@@ -83,6 +83,10 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.kjetland</groupId>
             <artifactId>mbknor-jackson-jsonschema_2.12</artifactId>