From c8b95546b5e83125023494924631c0185e7d6dc8 Mon Sep 17 00:00:00 2001
From: khalilou88 <32600911+khalilou88@users.noreply.github.com>
Date: Mon, 20 Nov 2023 01:09:32 +0100
Subject: [PATCH] fix: fix maven warning (#626)

* fix: fix maven warning

* build: work in progress

* build: work in progress

* build: work in progress

* build: work in progress

---------

Co-authored-by: khalilou88 <khalilou88@users.noreply.github.com>
---
 .../maven/kotlin/pom.xml__template__          | 20 ------
 .../library/maven/kotlin/pom.xml__template__  | 36 +++++-----
 .../parent-project/files/pom.xml__template__  | 65 ++++++++++++++-----
 3 files changed, 64 insertions(+), 57 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__
index a0e903c0d..09687d228 100644
--- 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,23 +55,6 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-<% if(dependencyManagement === 'bom') { -%>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <source>src/main/kotlin</source>
-                <source>target/generated-sources/annotations</source>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-<% } -%>
         <configuration>
           <args>
             <arg>-Xjsr305=strict</arg>
@@ -79,9 +62,6 @@
           <compilerPlugins>
             <plugin>spring</plugin>
           </compilerPlugins>
-<% if(dependencyManagement === 'bom') { -%>
-          <jvmTarget>${java.version}</jvmTarget>
-<% } -%>
         </configuration>
         <dependencies>
           <dependency>
diff --git a/packages/internal/generators-files/boot/library/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/boot/library/maven/kotlin/pom.xml__template__
index 7beaa576a..29fdd3576 100644
--- a/packages/internal/generators-files/boot/library/maven/kotlin/pom.xml__template__
+++ b/packages/internal/generators-files/boot/library/maven/kotlin/pom.xml__template__
@@ -40,27 +40,25 @@
     <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
     <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
     <plugins>
-        <plugin>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <configuration>
+          <args>
+            <arg>-Xjsr305=strict</arg>
+          </args>
+          <compilerPlugins>
+            <plugin>spring</plugin>
+          </compilerPlugins>
+        </configuration>
+        <dependencies>
+          <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-maven-plugin</artifactId>
+            <artifactId>kotlin-maven-allopen</artifactId>
             <version>${kotlin.version}</version>
-
-            <executions>
-                <execution>
-                    <id>compile</id>
-                    <goals>
-                        <goal>compile</goal>
-                    </goals>
-                </execution>
-
-                <execution>
-                    <id>test-compile</id>
-                    <goals>
-                        <goal>test-compile</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 
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__
index 52fd8291b..69e52f652 100644
--- a/packages/nx-maven/src/generators/parent-project/files/pom.xml__template__
+++ b/packages/nx-maven/src/generators/parent-project/files/pom.xml__template__
@@ -39,6 +39,53 @@
 	</dependencyManagement>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring.boot.version}</version>
+          <executions>
+            <execution>
+              <id>repackage</id>
+              <goals>
+                <goal>repackage</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <mainClass>${start-class}</mainClass>
+          </configuration>
+        </plugin>
+<% if(language === 'kotlin' || language === 'java-kotlin') { -%>
+        <plugin>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-plugin</artifactId>
+            <version>${kotlin.version}</version>
+            <configuration>
+              <jvmTarget>${java.version}</jvmTarget>
+              <javaParameters>true</javaParameters>
+            </configuration>
+            <executions>
+              <execution>
+              <id>compile</id>
+              <phase>compile</phase>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+            </execution>
+              <execution>
+                <id>test-compile</id>
+                <phase>test-compile</phase>
+                <goals>
+                  <goal>test-compile</goal>
+                </goals>
+              </execution>
+            </executions>
+        </plugin>
+<% } -%>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -48,7 +95,6 @@
           <parameters>true</parameters>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -62,23 +108,6 @@
         </configuration>
       </plugin>
     </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>${spring.boot.version}</version>
-        </plugin>
-<% if(language === 'kotlin' || language === 'java-kotlin') { -%>
-        <plugin>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-maven-plugin</artifactId>
-          <version>${kotlin.version}</version>
-        </plugin>
-<% } -%>
-      </plugins>
-    </pluginManagement>
   </build>
 <% } -%>