Revert "split delombok into a profile and do not run delombok in travis because delombok-maven-plugin does not support jdk14"

This reverts commit 3a7a0aa

Author: XenoAmess

deploy.cmd

@@ -1,14 +1,14 @@
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok
 cd ./src/
 cd ./base/
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok
 cd ../
 cd ./coordinate
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok
 cd ../
 cd ./rpg_module
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok
 cd ../
 cd ./demo
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pauto_clean_delombok
 pause

pom.xml

@@ -169,29 +169,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>delombok</id>
-            <!-- GPG mvn clean deploy -P release -Dgpg.passphrase=YourPassphase -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.projectlombok</groupId>
-                        <artifactId>lombok-maven-plugin</artifactId>
-                        <version>${lombok-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>delombok</goal>
-                                    <goal>testDelombok</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>auto_clean_delombok</id>
             <build>
@@ -1038,6 +1015,20 @@
                     </testExcludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok-maven-plugin</artifactId>
+                <version>${lombok-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>delombok</goal>
+                            <goal>testDelombok</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

site.cmd

@@ -1,14 +1,14 @@
-call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok -Pdelombok
+call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok
 cd ./src/
 cd ./base/
-call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok -Pdelombok
+call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok
 cd ../
 cd ./coordinate
-call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok -Pdelombok
+call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok
 cd ../
 cd ./rpg_module
-call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok -Pdelombok
+call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok
 cd ../
 cd ./demo
-call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok -Pdelombok
+call mvn clean site -Dmaven.javadoc.skip=false -Pauto_clean_delombok
 pause

sonar.cmd

@@ -1,4 +1,4 @@
-call mvn clean install -Dmaven.javadoc.skip=false -Pdelombok
+call mvn clean install -Dmaven.javadoc.skip=false
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.projectKey=cyanpotion_cyan_potion ^
@@ -13,7 +13,7 @@ call mvn sonar:sonar ^
 
 cd ./src/
 cd ./base/
-call mvn clean install -Dmaven.javadoc.skip=false -Pdelombok
+call mvn clean install -Dmaven.javadoc.skip=false
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -38,7 +38,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./coordinate
-call mvn clean install -Dmaven.javadoc.skip=false -Pdelombok
+call mvn clean install -Dmaven.javadoc.skip=false
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -63,7 +63,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./rpg_module
-call mvn clean install -Dmaven.javadoc.skip=false -Pdelombok
+call mvn clean install -Dmaven.javadoc.skip=false
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -88,7 +88,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./demo
-call mvn clean install -Dmaven.javadoc.skip=false -Pdelombok
+call mvn clean install -Dmaven.javadoc.skip=false
 
 cd ../
 cd ../

sonar_deploy.cmd

@@ -1,4 +1,4 @@
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.projectKey=cyanpotion_cyan_potion ^
@@ -13,7 +13,7 @@ call mvn sonar:sonar ^
 
 cd ./src/
 cd ./base/
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -38,7 +38,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./coordinate
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -63,7 +63,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./rpg_module
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh
 call mvn sonar:sonar ^
 -Dsonar.scm.exclusions.disabled=true ^
 -Dsonar.sources=src/main/,target/generated-sources/ ^
@@ -88,7 +88,7 @@ call mvn sonar:sonar ^
 
 cd ../
 cd ./demo
-call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh -Pdelombok
+call mvn clean deploy -Dmaven.javadoc.skip=false -Possrh
 
 cd ../
 cd ../