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 16221bd22..a0e903c0d 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,7 +55,7 @@ org.jetbrains.kotlin kotlin-maven-plugin -<% if(plugin === '@jnxplus/nx-maven') { -%> +<% if(dependencyManagement === 'bom') { -%> compile @@ -79,7 +79,7 @@ spring -<% if(plugin === '@jnxplus/nx-maven') { -%> +<% if(dependencyManagement === 'bom') { -%> ${java.version} <% } -%> @@ -91,6 +91,24 @@ + +<% if(dependencyManagement === 'bom' && packaging === 'war') { -%> + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + + + ${start-class} + true + + + + +<% } -%> + + 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__ index b5fc892de..2018aebce 100644 --- 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 @@ This project was generated with <%= plugin %> - ${java.version} - UTF-8 - UTF-8 - 3.11.0 - 3.0.0 - 3.0.0 true @@ -64,18 +58,9 @@ - - maven-compiler-plugin - ${compiler-plugin.version} - - - -parameters - - - maven-surefire-plugin - ${surefire-plugin.version} + ${maven-surefire-plugin.version} org.jboss.logmanager.LogManager @@ -85,7 +70,7 @@ maven-failsafe-plugin - ${failsafe-plugin.version} + ${maven-failsafe-plugin.version} @@ -104,7 +89,7 @@ - + native 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__ index 5dffe855d..112ae5d01 100644 --- 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 @@ This project was generated with <%= plugin %> - ${java.version} - UTF-8 - UTF-8 - 3.11.0 - 3.0.0 true @@ -74,18 +69,9 @@ - - maven-compiler-plugin - ${compiler-plugin.version} - - - -parameters - - - maven-surefire-plugin - ${surefire-plugin.version} + ${maven-surefire-plugin.version} org.jboss.logmanager.LogManager @@ -95,7 +81,7 @@ maven-failsafe-plugin - ${surefire-plugin.version} + ${maven-surefire-plugin.version} 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__ index 2d4ce0835..b2987e3fb 100644 --- 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 @@ <%= projectName %> This project was generated with <%= plugin %> - - ${java.version} - UTF-8 - UTF-8 - 3.11.0 - 3.0.0 - - io.quarkus 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 26e690ea6..01351efd7 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__ @@ -16,6 +16,16 @@ This project was generated with nx-maven <% if(framework === 'spring-boot') { -%> + + @ + ${java.version} + UTF-8 + UTF-8 + 3.11.0 + 3.3.1 + 3.4.0 + + @@ -29,6 +39,30 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + true + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + ${project.build.sourceEncoding} + + ${resource.delimiter} + + false + + + + @@ -49,6 +83,16 @@ <% } -%> <% if(framework === 'quarkus') { -%> + + ${java.version} + UTF-8 + UTF-8 + 3.11.0 + 3.0.0 + 3.0.0 + 3.3.1 + + @@ -60,6 +104,25 @@ + + + + + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + -parameters + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + <% } -%> <% if(framework === 'micronaut') { -%>