From ccae08dbcbb6de311e0a026a9a033bd6d542ee47 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Tue, 12 Aug 2025 18:44:02 -0300
Subject: [PATCH] bump RECOMMENDED_JAVA_VERSION

---
 generators/generator-constants.js | 3 ++-
 lib/testing/github-matrix.ts      | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/generators/generator-constants.js b/generators/generator-constants.js
index c53071cd4e90..0e9e0a8a1094 100644
--- a/generators/generator-constants.js
+++ b/generators/generator-constants.js
@@ -27,7 +27,7 @@ export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
 export const JHIPSTER_DEPENDENCIES_VERSION = '8.11.0';
 // Version of Java
-export const RECOMMENDED_JAVA_VERSION = '17';
+export const RECOMMENDED_JAVA_VERSION = '21';
 // Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
 export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '24'];
 // Force spring milestone repository. Spring Boot milestones are detected.
@@ -38,6 +38,7 @@ export const RECOMMENDED_NODE_VERSION = readFileSync(
   join(fileURLToPath(import.meta.url), '../init/resources/.node-version'),
   'utf-8',
 ).trim();
+export const SUPPORTED_NODE_VERSIONS = ['20', '22', '24'];
 
 // The version should be coherent with the one from spring-data-elasticsearch project
 export const ELASTICSEARCH_TAG = '8.13.4';
diff --git a/lib/testing/github-matrix.ts b/lib/testing/github-matrix.ts
index 719ab665f835..1bdcf54fb1ff 100644
--- a/lib/testing/github-matrix.ts
+++ b/lib/testing/github-matrix.ts
@@ -2,7 +2,12 @@ import { createHash } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { JAVA_COMPATIBLE_VERSIONS, RECOMMENDED_JAVA_VERSION, RECOMMENDED_NODE_VERSION } from '../../generators/generator-constants.js';
+import {
+  JAVA_COMPATIBLE_VERSIONS,
+  RECOMMENDED_JAVA_VERSION,
+  RECOMMENDED_NODE_VERSION,
+  SUPPORTED_NODE_VERSIONS,
+} from '../../generators/generator-constants.js';
 import { getSourceRoot } from '../index.ts';
 
 const knwonGitHubMatrixProperties = [
@@ -78,7 +83,7 @@ const randomEnvironmentMatrix = (key: string, options: RandomEnvironmentOptions)
   const {
     useVersionPlaceholders,
     javaVersions = [RECOMMENDED_JAVA_VERSION, ...JAVA_COMPATIBLE_VERSIONS],
-    nodeVersions = [RECOMMENDED_NODE_VERSION, '20', '22'],
+    nodeVersions = [RECOMMENDED_NODE_VERSION, ...SUPPORTED_NODE_VERSIONS],
   } = options;
   const javaVersion = randomReproducibleValue(`java-${key}`, javaVersions, { useVersionPlaceholders });
   const nodeVersion = randomReproducibleValue(`node-${key}`, nodeVersions, { useVersionPlaceholders });