feat: fix Maven plugin validation warnings (#625)

* feat: fix Maven plugin validation warnings * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress --------- Co-authored-by: khalilou88 <[email protected]>
khalilou88 · Nov 18, 2023 · 671c17a · 671c17a
1 parent 0309e87
commit 671c17a
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 44 deletions.
diff --git a/packages/internal/generators-files/boot/application/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/boot/application/maven/kotlin/pom.xml__template__
@@ -55,7 +55,7 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-<% if(plugin === '@jnxplus/nx-maven') { -%>
+<% if(dependencyManagement === 'bom') { -%>
         <executions>
           <execution>
             <id>compile</id>
@@ -79,7 +79,7 @@
           <compilerPlugins>
             <plugin>spring</plugin>
           </compilerPlugins>
-<% if(plugin === '@jnxplus/nx-maven') { -%>
+<% if(dependencyManagement === 'bom') { -%>
           <jvmTarget>${java.version}</jvmTarget>
 <% } -%>
         </configuration>
@@ -91,6 +91,24 @@
           </dependency>
         </dependencies>
       </plugin>
+
+<% if(dependencyManagement === 'bom' && packaging === 'war') { -%>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>${maven-war-plugin.version}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>${start-class}</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+<% } -%>
+
+
     </plugins>
   </build>
 

diff --git a/packages/internal/generators-files/quarkus/application/maven/java/pom.xml__template__ b/packages/internal/generators-files/quarkus/application/maven/java/pom.xml__template__
@@ -15,12 +15,6 @@
 	<description>This project was generated with <%= plugin %></description>
 
   <properties>
-    <maven.compiler.release>${java.version}</maven.compiler.release>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <surefire-plugin.version>3.0.0</surefire-plugin.version>
-    <failsafe-plugin.version>3.0.0</failsafe-plugin.version>
     <skipITs>true</skipITs>
   </properties>
 
@@ -64,18 +58,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler-plugin.version}</version>
-        <configuration>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>${maven-surefire-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
@@ -85,7 +70,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${failsafe-plugin.version}</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <executions>
           <execution>
             <goals>
@@ -104,7 +89,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <profiles>
     <profile>
       <id>native</id>

diff --git a/packages/internal/generators-files/quarkus/application/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/quarkus/application/maven/kotlin/pom.xml__template__
@@ -15,11 +15,6 @@
 	<description>This project was generated with <%= plugin %></description>
 
   <properties>
-    <maven.compiler.release>${java.version}</maven.compiler.release>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <surefire-plugin.version>3.0.0</surefire-plugin.version>
     <skipITs>true</skipITs>
   </properties>
 
@@ -74,18 +69,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler-plugin.version}</version>
-        <configuration>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>${maven-surefire-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
@@ -95,7 +81,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>${maven-surefire-plugin.version}</version>
         <executions>
           <execution>
             <goals>

diff --git a/packages/internal/generators-files/quarkus/library/maven/java/pom.xml__template__ b/packages/internal/generators-files/quarkus/library/maven/java/pom.xml__template__
@@ -14,14 +14,6 @@
 	<name><%= projectName %></name>
 	<description>This project was generated with <%= plugin %></description>
 
-   <properties>
-	   <maven.compiler.release>${java.version}</maven.compiler.release>
-		 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		 <compiler-plugin.version>3.11.0</compiler-plugin.version>
-		 <surefire-plugin.version>3.0.0</surefire-plugin.version>
-	 </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/packages/nx-maven/src/generators/parent-project/files/pom.xml__template__ b/packages/nx-maven/src/generators/parent-project/files/pom.xml__template__
@@ -16,6 +16,16 @@
 	<description>This project was generated with nx-maven</description>
 
 <% if(framework === 'spring-boot') { -%>
+  <properties>
+    <resource.delimiter>@</resource.delimiter>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+    <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+  </properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -29,6 +39,30 @@
 	</dependencyManagement>
 
   <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <parameters>true</parameters>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>${maven-resources-plugin.version}</version>
+        <configuration>
+          <propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
+          <delimiters>
+            <delimiter>${resource.delimiter}</delimiter>
+          </delimiters>
+          <useDefaultDelimiters>false</useDefaultDelimiters>
+        </configuration>
+      </plugin>
+    </plugins>
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -49,6 +83,16 @@
 <% } -%>
 
 <% if(framework === 'quarkus') { -%>
+  <properties>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+    <maven-failsafe-plugin.version>3.0.0</maven-failsafe-plugin.version>
+    <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -60,6 +104,25 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <compilerArgs>
+            <arg>-parameters</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-plugin.version}</version>
+      </plugin>
+    </plugins>
+  </build>
 <% } -%>
 
 <% if(framework === 'micronaut') { -%>