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
This commit is contained in:
parent
0d360a264b
commit
d1984f843c
@ -1,7 +1,6 @@
|
|||||||
package com.baeldung.lombok.valvar;
|
package com.baeldung.lombok.valvar;
|
||||||
|
|
||||||
import lombok.val;
|
import lombok.val;
|
||||||
import lombok.var;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package com.baeldung.lombok.valvar;
|
package com.baeldung.lombok.valvar;
|
||||||
|
|
||||||
import lombok.var;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -53,11 +53,27 @@
|
|||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</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>
|
<properties>
|
||||||
<!-- lombok: https://projectlombok.org/changelog.html -->
|
<!-- lombok: https://projectlombok.org/changelog.html -->
|
||||||
<lombok.version>1.14.8</lombok.version>
|
<lombok.version>1.14.8</lombok.version>
|
||||||
<metainf-services.version>1.8</metainf-services.version>
|
<metainf-services.version>1.8</metainf-services.version>
|
||||||
<eclipse.jdt.core.version>3.3.0-v_771</eclipse.jdt.core.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>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
@ -40,41 +40,19 @@
|
|||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</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>
|
</build>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<lombok.version>edge-SNAPSHOT</lombok.version>
|
||||||
<hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.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>
|
<delombok-maven-plugin.version>1.18.20.0</delombok-maven-plugin.version>
|
||||||
<annotations.version>23.0.0</annotations.version>
|
<annotations.version>23.0.0</annotations.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>projectlombok.org</id>
|
||||||
|
<url>https://projectlombok.org/edge-releases</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
</project>
|
</project>
|
@ -18,10 +18,21 @@
|
|||||||
<modules>
|
<modules>
|
||||||
<module>lombok</module>
|
<module>lombok</module>
|
||||||
<module>lombok-2</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>
|
</modules>
|
||||||
|
|
||||||
<build>
|
<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>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -32,4 +43,9 @@
|
|||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>11</maven.compiler.source>
|
||||||
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
6
pom.xml
6
pom.xml
@ -363,7 +363,7 @@
|
|||||||
<module>libraries-3</module>
|
<module>libraries-3</module>
|
||||||
<module>libraries-jdk8</module>
|
<module>libraries-jdk8</module>
|
||||||
|
|
||||||
<module>lombok-modules</module>
|
<module>lombok-modules/lombok-custom</module>
|
||||||
|
|
||||||
<module>muleesb</module>
|
<module>muleesb</module>
|
||||||
|
|
||||||
@ -559,7 +559,7 @@
|
|||||||
<module>libraries-3</module>
|
<module>libraries-3</module>
|
||||||
<module>libraries-jdk8</module>
|
<module>libraries-jdk8</module>
|
||||||
|
|
||||||
<module>lombok-modules</module>
|
<module>lombok-modules/lombok-custom</module>
|
||||||
<module>muleesb</module>
|
<module>muleesb</module>
|
||||||
|
|
||||||
<module>web-modules</module>
|
<module>web-modules</module>
|
||||||
@ -735,6 +735,7 @@
|
|||||||
</build>
|
</build>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
<module>lombok-modules</module>
|
||||||
<module>osgi</module>
|
<module>osgi</module>
|
||||||
<module>spring-katharsis</module>
|
<module>spring-katharsis</module>
|
||||||
<module>logging-modules</module>
|
<module>logging-modules</module>
|
||||||
@ -986,6 +987,7 @@
|
|||||||
</build>
|
</build>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
<module>lombok-modules</module>
|
||||||
<module>osgi</module>
|
<module>osgi</module>
|
||||||
<module>spring-katharsis</module>
|
<module>spring-katharsis</module>
|
||||||
<module>logging-modules</module>
|
<module>logging-modules</module>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user