From 5d6e1c416813955b884e912304d4c9345648414d Mon Sep 17 00:00:00 2001 From: khalilou88 <32600911+khalilou88@users.noreply.github.com> Date: Thu, 30 Nov 2023 23:47:53 +0100 Subject: [PATCH] build: update pom.xml files (#661) * build: update pom.xml files * build: work in progress --------- Co-authored-by: khalilou88 --- .../application/maven/java/pom.xml__template__ | 15 ++++++++------- .../application/maven/kotlin/pom.xml__template__ | 15 ++++++++------- .../boot/library/maven/java/pom.xml__template__ | 11 ++++++----- .../boot/library/maven/kotlin/pom.xml__template__ | 13 +++++++------ .../application/maven/java/pom.xml__template__ | 2 +- .../application/maven/kotlin/pom.xml__template__ | 2 +- .../library/maven/java/pom.xml__template__ | 13 +++++++------ .../library/maven/kotlin/pom.xml__template__ | 11 ++++++----- .../application/maven/java/pom.xml__template__ | 15 ++++++++------- .../application/maven/kotlin/pom.xml__template__ | 11 ++++++----- .../none/library/maven/java/pom.xml__template__ | 15 ++++++++------- .../none/library/maven/kotlin/pom.xml__template__ | 13 +++++++------ .../application/maven/java/pom.xml__template__ | 13 +++++++------ .../application/maven/kotlin/pom.xml__template__ | 11 ++++++----- .../library/maven/java/pom.xml__template__ | 11 ++++++----- .../library/maven/kotlin/pom.xml__template__ | 11 ++++++----- .../parent-project/files/pom.xml__template__ | 13 +++++++------ 17 files changed, 105 insertions(+), 90 deletions(-) diff --git a/packages/internal/generators-files/boot/application/maven/java/pom.xml__template__ b/packages/internal/generators-files/boot/application/maven/java/pom.xml__template__ index 10f7467cb..953f79d9c 100644 --- a/packages/internal/generators-files/boot/application/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/boot/application/maven/java/pom.xml__template__ @@ -2,12 +2,6 @@ 4.0.0 - - <%= parentGroupId %> - <%= parentProjectName %> - <%= parentProjectVersion %> - <%= relativePath %> - <%= groupId %> <%= projectName %> <%= projectVersion %> @@ -15,7 +9,14 @@ war <% } -%> <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven + + + <%= parentGroupId %> + <%= parentProjectName %> + <%= parentProjectVersion %> + <%= relativePath %> + 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 f7c8238ec..c75dd3aa6 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__ @@ -2,12 +2,6 @@ 4.0.0 - - <%= parentGroupId %> - <%= parentProjectName %> - <%= parentProjectVersion %> - <%= relativePath %> - <%= groupId %> <%= projectName %> <%= projectVersion %> @@ -15,7 +9,14 @@ war <% } -%> <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven + + + <%= parentGroupId %> + <%= parentProjectName %> + <%= parentProjectVersion %> + <%= relativePath %> + diff --git a/packages/internal/generators-files/boot/library/maven/java/pom.xml__template__ b/packages/internal/generators-files/boot/library/maven/java/pom.xml__template__ index b8dcb46e3..1f6063012 100644 --- a/packages/internal/generators-files/boot/library/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/boot/library/maven/java/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> 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 29fdd3576..2f6178490 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__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> - <%= relativePath %> + <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> diff --git a/packages/internal/generators-files/micronaut/application/maven/java/pom.xml__template__ b/packages/internal/generators-files/micronaut/application/maven/java/pom.xml__template__ index 739b7e3d6..a5c9d8007 100644 --- a/packages/internal/generators-files/micronaut/application/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/micronaut/application/maven/java/pom.xml__template__ @@ -7,7 +7,7 @@ <%= projectVersion %> ${packaging} <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven <%= parentGroupId %> diff --git a/packages/internal/generators-files/micronaut/application/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/micronaut/application/maven/kotlin/pom.xml__template__ index cffc7727a..825c4fdd9 100644 --- a/packages/internal/generators-files/micronaut/application/maven/kotlin/pom.xml__template__ +++ b/packages/internal/generators-files/micronaut/application/maven/kotlin/pom.xml__template__ @@ -7,7 +7,7 @@ <%= projectVersion %> ${packaging} <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven <%= parentGroupId %> diff --git a/packages/internal/generators-files/micronaut/library/maven/java/pom.xml__template__ b/packages/internal/generators-files/micronaut/library/maven/java/pom.xml__template__ index dd1fc8e64..deeeedfd2 100644 --- a/packages/internal/generators-files/micronaut/library/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/micronaut/library/maven/java/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 - + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> diff --git a/packages/internal/generators-files/micronaut/library/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/micronaut/library/maven/kotlin/pom.xml__template__ index 0fbd22a85..52c675e31 100644 --- a/packages/internal/generators-files/micronaut/library/maven/kotlin/pom.xml__template__ +++ b/packages/internal/generators-files/micronaut/library/maven/kotlin/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> diff --git a/packages/internal/generators-files/none/application/maven/java/pom.xml__template__ b/packages/internal/generators-files/none/application/maven/java/pom.xml__template__ index 2ea8a0fc3..60dee2c62 100644 --- a/packages/internal/generators-files/none/application/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/none/application/maven/java/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 - - <%= parentGroupId %> - <%= parentProjectName %> - <%= parentProjectVersion %> - <%= relativePath %> - <%= groupId %> <%= projectName %> <%= projectVersion %> <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven + + + <%= parentGroupId %> + <%= parentProjectName %> + <%= parentProjectVersion %> + <%= relativePath %> + ${java.version} diff --git a/packages/internal/generators-files/none/application/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/none/application/maven/kotlin/pom.xml__template__ index 463f30526..9cab04c99 100644 --- a/packages/internal/generators-files/none/application/maven/kotlin/pom.xml__template__ +++ b/packages/internal/generators-files/none/application/maven/kotlin/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> diff --git a/packages/internal/generators-files/none/library/maven/java/pom.xml__template__ b/packages/internal/generators-files/none/library/maven/java/pom.xml__template__ index 1eac437de..1ba16f4c1 100644 --- a/packages/internal/generators-files/none/library/maven/java/pom.xml__template__ +++ b/packages/internal/generators-files/none/library/maven/java/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 - - <%= parentGroupId %> - <%= parentProjectName %> - <%= parentProjectVersion %> - <%= relativePath %> - <%= groupId %> <%= projectName %> <%= projectVersion %> <%= projectName %> - This project was generated with <%= plugin %> + This project was generated with nx-maven + + + <%= parentGroupId %> + <%= parentProjectName %> + <%= parentProjectVersion %> + <%= relativePath %> + ${java.version} diff --git a/packages/internal/generators-files/none/library/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/none/library/maven/kotlin/pom.xml__template__ index d1d4dfe12..16a81e178 100644 --- a/packages/internal/generators-files/none/library/maven/kotlin/pom.xml__template__ +++ b/packages/internal/generators-files/none/library/maven/kotlin/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> - <%= relativePath %> + <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> 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 2018aebce..0b99cb58b 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__ @@ -2,17 +2,18 @@ 4.0.0 - + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> true 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 112ae5d01..2038056e1 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__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> true 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 b2987e3fb..d5e47e7c2 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__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> diff --git a/packages/internal/generators-files/quarkus/library/maven/kotlin/pom.xml__template__ b/packages/internal/generators-files/quarkus/library/maven/kotlin/pom.xml__template__ index 1fb2035e1..32399408a 100644 --- a/packages/internal/generators-files/quarkus/library/maven/kotlin/pom.xml__template__ +++ b/packages/internal/generators-files/quarkus/library/maven/kotlin/pom.xml__template__ @@ -2,17 +2,18 @@ 4.0.0 + <%= groupId %> + <%= projectName %> + <%= projectVersion %> + <%= projectName %> + This project was generated with nx-maven + <%= parentGroupId %> <%= parentProjectName %> <%= parentProjectVersion %> <%= relativePath %> - <%= groupId %> - <%= projectName %> - <%= projectVersion %> - <%= projectName %> - This project was generated with <%= plugin %> 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 090192123..0ad70db86 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__ @@ -2,12 +2,6 @@ 4.0.0 - - <%= parentGroupId %> - <%= parentProjectName %> - <%= parentProjectVersion %> - <%= relativePath %> - <%= groupId %> <%= projectName %> <%= projectVersion %> @@ -15,6 +9,13 @@ <%= projectName %> This project was generated with nx-maven + + <%= parentGroupId %> + <%= parentProjectName %> + <%= parentProjectVersion %> + <%= relativePath %> + + <% if(framework === 'spring-boot') { -%> @