From d1984f843c90220b7bd3d59e970f9727578fa074 Mon Sep 17 00:00:00 2001
From: 3hsan <56245694+ehsansasanian@users.noreply.github.com>
Date: Wed, 12 Apr 2023 03:57:59 +0200
Subject: [PATCH] Move lombok-module to jdk9-and-above group (excluded
 lombok-custom) (#13771)

* Move lombok-module to jdk9-and-above group (excluded lombok-custom)

* Update lombok version

* JAVA-18157: Update lombok version for lombok submodule, and add compiler plugin
---
 .../baeldung/lombok/valvar/ValExample.java    |  1 -
 .../baeldung/lombok/valvar/VarExample.java    |  1 -
 lombok-modules/lombok-custom/pom.xml          | 16 +++++++++
 lombok-modules/lombok/pom.xml                 | 36 ++++---------------
 lombok-modules/pom.xml                        | 18 +++++++++-
 pom.xml                                       |  6 ++--
 6 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
index b7ecd95fa8..f436ef81dd 100644
--- a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
@@ -1,7 +1,6 @@
 package com.baeldung.lombok.valvar;
 
 import lombok.val;
-import lombok.var;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
index 6fabf66590..138264db09 100644
--- a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
@@ -1,6 +1,5 @@
 package com.baeldung.lombok.valvar;
 
-import lombok.var;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lombok-modules/lombok-custom/pom.xml b/lombok-modules/lombok-custom/pom.xml
index c119900c8a..1f7f630772 100644
--- a/lombok-modules/lombok-custom/pom.xml
+++ b/lombok-modules/lombok-custom/pom.xml
@@ -53,11 +53,27 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <!-- lombok: https://projectlombok.org/changelog.html -->
         <lombok.version>1.14.8</lombok.version>
         <metainf-services.version>1.8</metainf-services.version>
         <eclipse.jdt.core.version>3.3.0-v_771</eclipse.jdt.core.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/lombok-modules/lombok/pom.xml b/lombok-modules/lombok/pom.xml
index 1be22f0bc2..57b2a5a999 100644
--- a/lombok-modules/lombok/pom.xml
+++ b/lombok-modules/lombok/pom.xml
@@ -40,41 +40,19 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok-maven-plugin</artifactId>
-                <version>${delombok-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>delombok</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>delombok</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-                            <outputDirectory>${project.build.directory}/delombok</outputDirectory>
-                            <addOutputDirectory>false</addOutputDirectory>
-                            <formatPreferences>
-                                <javaLangAsFQN>skip</javaLangAsFQN>
-                            </formatPreferences>
-                            <verbose>false</verbose>
-                        </configuration>
-                    </execution>
-                    <!-- This is for delomboking also your tests sources. -->
-                    <!--<execution> <id>test-delombok</id> -->
-                    <!-- <phase>generate-test-sources</phase> <goals> <goal>testDelombok</goal> </goals> -->
-                    <!--<configuration> <verbose>false</verbose> </configuration> </execution> -->
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
+        <lombok.version>edge-SNAPSHOT</lombok.version>
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
         <delombok-maven-plugin.version>1.18.20.0</delombok-maven-plugin.version>
         <annotations.version>23.0.0</annotations.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>projectlombok.org</id>
+            <url>https://projectlombok.org/edge-releases</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/lombok-modules/pom.xml b/lombok-modules/pom.xml
index 7ca303af9d..f2bfdb51c0 100644
--- a/lombok-modules/pom.xml
+++ b/lombok-modules/pom.xml
@@ -18,10 +18,21 @@
     <modules>
         <module>lombok</module>
         <module>lombok-2</module>
-        <module>lombok-custom</module>
+<!--        <module>lombok-custom</module>--> <!-- this module uses legacy jdk-8 features (tools.jar), so can't upgrade to jdk9 or above-->
     </modules>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -32,4 +43,9 @@
         </pluginManagement>
     </build>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1cc5f92cf8..2548dbfbde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,7 +363,7 @@
                 <module>libraries-3</module>
                 <module>libraries-jdk8</module>
 
-                <module>lombok-modules</module>
+                <module>lombok-modules/lombok-custom</module>
 
                 <module>muleesb</module>
 
@@ -559,7 +559,7 @@
                 <module>libraries-3</module>
                 <module>libraries-jdk8</module>
 
-                <module>lombok-modules</module>
+                <module>lombok-modules/lombok-custom</module>
                 <module>muleesb</module>
 
                 <module>web-modules</module>
@@ -735,6 +735,7 @@
             </build>
 
             <modules>
+                <module>lombok-modules</module>
                 <module>osgi</module>
                 <module>spring-katharsis</module>
                 <module>logging-modules</module>
@@ -986,6 +987,7 @@
             </build>
 
             <modules>
+                <module>lombok-modules</module>
                 <module>osgi</module>
                 <module>spring-katharsis</module>
                 <module>logging-modules</module>