From 10d01934b92c36da369df3e3b100f15d7a74918f Mon Sep 17 00:00:00 2001
From: Frederik Hahne <atomfrede@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:23:53 +0000
Subject: [PATCH] align maven plugin version with main generator

---
 generators/constants.cjs                |  8 +++---
 generators/server/generator.js          |  5 ++--
 generators/server/templates/pom.xml.ejs | 33 ++++++++++++++-----------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/generators/constants.cjs b/generators/constants.cjs
index 2b7cc53..f7eb701 100644
--- a/generators/constants.cjs
+++ b/generators/constants.cjs
@@ -52,9 +52,9 @@ module.exports = {
     },
   },
   versions: {
-    micronaut: '4.0.3',
-    micronautData: '4.0.4',
-    micronautDiscoveryClient: '4.0.1',
+    micronaut: '4.2.0',
+    micronautData: '4.2.0',
+    micronautDiscoveryClient: '4.2.0',
     micronautOpenApi: '4.8.7',
     netty: '4.1.97.Final',
     rxJava3: '2.3.0',
@@ -74,6 +74,6 @@ module.exports = {
     caffeine: '3.1.1',
     archunit: '0.23.1',
     simplejavamail: '7.5.0',
-    testcontainers: '1.17.3',
+    testcontainers: '1.19.3',
   },
 };
diff --git a/generators/server/generator.js b/generators/server/generator.js
index 5381cd9..8a14d83 100644
--- a/generators/server/generator.js
+++ b/generators/server/generator.js
@@ -116,9 +116,8 @@ export default class extends ServerGenerator {
         application.MN_CONSTANTS = mnConstants;
         application.gradleVersion = mnConstants.GRADLE_VERSION;
         application.dockerContainers.redis = mnConstants.DOCKER_REDIS;
-        application.jhipsterDependenciesVersion = '7.9.3';
-        // Revert to java 11 to fix redis.
-        application.JAVA_VERSION = '11';
+        application.jhipsterDependenciesVersion = '8.0.0';
+        application.JAVA_VERSION = '17';
         // Add liquibase h2 database references.
         application.liquibaseAddH2Properties = true;
         // Micronaut is a java project.
diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
index bbcc6b9..fc16450 100644
--- a/generators/server/templates/pom.xml.ejs
+++ b/generators/server/templates/pom.xml.ejs
@@ -118,34 +118,37 @@ _%>
 <%_ if (cacheProviderEhcache) { _%>
         <ehcache.version>3.10.8</ehcache.version>
 <%_ } _%>
+        <archunit-junit5.version><%- javaDependencies['archunit-junit5'] %></archunit-junit5.version>
         <testcontainers.version><%= versions.testcontainers %></testcontainers.version>
         <!-- Plugin versions -->
-        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+        <maven-clean-plugin.version><%- javaDependencies['maven-clean-plugin'] %></maven-clean-plugin.version>
+        <maven-compiler-plugin.version><%- javaDependencies['maven-compiler-plugin'] %></maven-compiler-plugin.version>
+        <maven-javadoc-plugin.version><%- javaDependencies['maven-javadoc-plugin'] %></maven-javadoc-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <!-- We can't go to 3.0.0-M2 as it has a regression. See https://issues.apache.org/jira/browse/MENFORCER-306 -->
-        <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
-        <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
-        <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
-        <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
-        <micronaut-plugin.version>3.2.3</micronaut-plugin.version>
+        <maven-site-plugin.version><%- javaDependencies['maven-site-plugin'] %></maven-site-plugin.version>
+        <maven-enforcer-plugin.version><%- javaDependencies['maven-enforcer-plugin'] %></maven-enforcer-plugin.version>        <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version><%- javaDependencies['maven-failsafe-plugin'] %></maven-failsafe-plugin.version>
+        <maven-idea-plugin.version><%- javaDependencies['maven-idea-plugin'] %></maven-idea-plugin.version>
+        <maven-resources-plugin.version><%- javaDependencies['maven-resources-plugin'] %></maven-resources-plugin.version>
+        <maven-surefire-plugin.version><%- javaDependencies['maven-surefire-plugin'] %></maven-surefire-plugin.version>
+        <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
+        <maven-checkstyle-plugin.version><%- javaDependencies['maven-checkstyle-plugin'] %></maven-checkstyle-plugin.version>
+        <maven-exec-plugin.version>3.1.1</maven-exec-plugin.version>
+        <micronaut-plugin.version>4.2.0</micronaut-plugin.version>
+        <spotless-maven-plugin.version><%- javaDependencies['spotless-maven-plugin'] %></spotless-maven-plugin.version>
 
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.10.0</frontend-maven-plugin.version>
 <%_ } _%>
-        <git-commit-id-plugin.version>4.0.2</git-commit-id-plugin.version>
+        <git-commit-id-maven-plugin.version><%- javaDependencies['git-commit-id-maven-plugin'] %></git-commit-id-maven-plugin.version>
         <jacoco-maven-plugin.version><%= javaDependencies['jacoco-maven-plugin'] %></jacoco-maven-plugin.version>
         <jib-maven-plugin.version><%= javaDependencies['jib-maven-plugin'] %></jib-maven-plugin.version>
         <jib-maven-plugin.image><%- dockerContainers.javaJre %></jib-maven-plugin.image>
         <jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-        <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
+        <properties-maven-plugin.version><%- javaDependencies['properties-maven-plugin'] %></properties-maven-plugin.version>
+        <sonar-maven-plugin.version><%- javaDependencies['sonar-maven-plugin'] %></sonar-maven-plugin.version>
         <jacoco.reportFolder>${project.build.directory}/jacoco</jacoco.reportFolder>
         <jacoco.utReportFile>${jacoco.reportFolder}/test.exec</jacoco.utReportFile>
         <jacoco.itReportFile>${jacoco.reportFolder}/integrationTest.exec</jacoco.itReportFile>
-- 
2.42.1