From 7cf79b11279f3b7bffee699ecc527d82c57e61c8 Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@riseup.net>
Date: Mon, 3 Feb 2020 10:44:50 +0800
Subject: [PATCH]  Move lombok dependency into root dependency manager for
 easier version management (#4309)

* Add lombok dependency into root pom.xml

* Update all depending lombok pom.xml(s)

* Change lombok version into latest(1.18.10)

* Revert lombok dependency config of test projects

* Remove redundant lombok dependency of submodule

* Move Lombok into dependencies node for applying globally
---
 oap-server/pom.xml                                    | 11 -----------
 pom.xml                                               |  7 +++++++
 test/e2e/pom.xml                                      |  2 +-
 test/plugin/mock-collector/pom.xml                    |  6 ------
 test/plugin/pom.xml                                   |  9 ++++++++-
 .../scenarios/elasticsearch-5.x-scenario/pom.xml      |  3 ++-
 .../plugin/scenarios/httpasyncclient-scenario/pom.xml |  2 +-
 .../postgresql-above9.4.1207-scenario/pom.xml         |  1 -
 test/plugin/scenarios/postgresql-scenario/pom.xml     |  1 -
 test/plugin/scenarios/solrj-7.x-scenario/pom.xml      |  1 -
 10 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/oap-server/pom.xml b/oap-server/pom.xml
index a96c1fada..0a1db6667 100755
--- a/oap-server/pom.xml
+++ b/oap-server/pom.xml
@@ -58,7 +58,6 @@
         <zookeeper.version>3.4.10</zookeeper.version>
         <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
         <jetty.version>9.4.2.v20170220</jetty.version>
-        <lombok.version>1.18.0</lombok.version>
         <h2.version>1.4.196</h2.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <commons-io.version>2.6</commons-io.version>
@@ -119,10 +118,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -310,12 +305,6 @@
                 <artifactId>jetty-servlet</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>
diff --git a/pom.xml b/pom.xml
index 3bdcc09fb..23ce62703 100755
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
         <checkstyle.version>6.18</checkstyle.version>
         <junit.version>4.12</junit.version>
         <mockito-all.version>1.10.19</mockito-all.version>
+        <lombok.version>1.18.10</lombok.version>
 
         <!-- core lib dependency -->
         <grpc.version>1.26.0</grpc.version>
@@ -247,6 +248,12 @@
             <version>${jmh.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml
index 9ab648d19..7f1f935a5 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -63,7 +63,7 @@
         <mysql.version>8.0.13</mysql.version>
         <elasticsearch.version>6.3.2</elasticsearch.version>
         <zookeeper.image.version>3.5</zookeeper.image.version>
-        <lombok.version>1.18.4</lombok.version>
+        <lombok.version>1.18.10</lombok.version>
 
         <!-- build.id is an available environment variable in Jenkins to
              distinguish the different build jobs, once Jenkins job is aborted,
diff --git a/test/plugin/mock-collector/pom.xml b/test/plugin/mock-collector/pom.xml
index d2e5f9619..d3df6140a 100644
--- a/test/plugin/mock-collector/pom.xml
+++ b/test/plugin/mock-collector/pom.xml
@@ -91,12 +91,6 @@
             <artifactId>gson</artifactId>
             <version>${gson.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index efcae7fdc..aacb7b438 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -47,7 +47,7 @@
         <junit.version>4.11</junit.version>
         <guava.version>20.0</guava.version>
         <gson.version>2.8.5</gson.version>
-        <lombok.version>1.18.4</lombok.version>
+        <lombok.version>1.18.10</lombok.version>
         <snakeyaml.version>1.24</snakeyaml.version>
 
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -87,6 +87,13 @@
             <artifactId>log4j-api</artifactId>
             <version>2.8.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml b/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml
index aadd20e91..4f0bf3a4a 100644
--- a/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml
+++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml
@@ -35,7 +35,7 @@
         <docker.image.version>${test.framework.version}</docker.image.version>
 
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.10</lombok.version>
         <log4j.version>2.8.1</log4j.version>
     </properties>
 
@@ -67,6 +67,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/test/plugin/scenarios/httpasyncclient-scenario/pom.xml b/test/plugin/scenarios/httpasyncclient-scenario/pom.xml
index aecf77547..6daabeac7 100644
--- a/test/plugin/scenarios/httpasyncclient-scenario/pom.xml
+++ b/test/plugin/scenarios/httpasyncclient-scenario/pom.xml
@@ -32,7 +32,7 @@
         <test.framework.version>4.1.2</test.framework.version>
         <docker.image.version>${test.framework.version}</docker.image.version>
         <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.10</lombok.version>
         <log4j.version>2.8.1</log4j.version>
     </properties>
 
diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/pom.xml b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/pom.xml
index 2df5d8783..29fd970ce 100644
--- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/pom.xml
+++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/pom.xml
@@ -35,7 +35,6 @@
         <docker.image.version>${test.framework.version}</docker.image.version>
 
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
-        <lombok.version>1.16.20</lombok.version>
         <log4j.version>2.8.1</log4j.version>
     </properties>
 
diff --git a/test/plugin/scenarios/postgresql-scenario/pom.xml b/test/plugin/scenarios/postgresql-scenario/pom.xml
index eb6b8a41e..f11c755a5 100644
--- a/test/plugin/scenarios/postgresql-scenario/pom.xml
+++ b/test/plugin/scenarios/postgresql-scenario/pom.xml
@@ -35,7 +35,6 @@
         <docker.image.version>${test.framework.version}</docker.image.version>
 
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
-        <lombok.version>1.16.20</lombok.version>
         <log4j.version>2.8.1</log4j.version>
     </properties>
 
diff --git a/test/plugin/scenarios/solrj-7.x-scenario/pom.xml b/test/plugin/scenarios/solrj-7.x-scenario/pom.xml
index 0b1c955ca..cbb14ed99 100644
--- a/test/plugin/scenarios/solrj-7.x-scenario/pom.xml
+++ b/test/plugin/scenarios/solrj-7.x-scenario/pom.xml
@@ -35,7 +35,6 @@
         <docker.image.version>${test.framework.version}</docker.image.version>
 
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
-        <lombok.version>1.16.20</lombok.version>
         <log4j.version>2.6.2</log4j.version>
     </properties>