Skip to content

Commit ccae08d

Browse files
committed
bump RECOMMENDED_JAVA_VERSION
1 parent 20e0a29 commit ccae08d

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

generators/generator-constants.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const BLUEPRINT_API_VERSION = 'jhipster-8';
2727
// jhipster-bom version
2828
export const JHIPSTER_DEPENDENCIES_VERSION = '8.11.0';
2929
// Version of Java
30-
export const RECOMMENDED_JAVA_VERSION = '17';
30+
export const RECOMMENDED_JAVA_VERSION = '21';
3131
// Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
3232
export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '24'];
3333
// Force spring milestone repository. Spring Boot milestones are detected.
@@ -38,6 +38,7 @@ export const RECOMMENDED_NODE_VERSION = readFileSync(
3838
join(fileURLToPath(import.meta.url), '../init/resources/.node-version'),
3939
'utf-8',
4040
).trim();
41+
export const SUPPORTED_NODE_VERSIONS = ['20', '22', '24'];
4142

4243
// The version should be coherent with the one from spring-data-elasticsearch project
4344
export const ELASTICSEARCH_TAG = '8.13.4';

lib/testing/github-matrix.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import { createHash } from 'node:crypto';
22
import { readFileSync } from 'node:fs';
33
import { join } from 'node:path';
44

5-
import { JAVA_COMPATIBLE_VERSIONS, RECOMMENDED_JAVA_VERSION, RECOMMENDED_NODE_VERSION } from '../../generators/generator-constants.js';
5+
import {
6+
JAVA_COMPATIBLE_VERSIONS,
7+
RECOMMENDED_JAVA_VERSION,
8+
RECOMMENDED_NODE_VERSION,
9+
SUPPORTED_NODE_VERSIONS,
10+
} from '../../generators/generator-constants.js';
611
import { getSourceRoot } from '../index.ts';
712

813
const knwonGitHubMatrixProperties = [
@@ -78,7 +83,7 @@ const randomEnvironmentMatrix = (key: string, options: RandomEnvironmentOptions)
7883
const {
7984
useVersionPlaceholders,
8085
javaVersions = [RECOMMENDED_JAVA_VERSION, ...JAVA_COMPATIBLE_VERSIONS],
81-
nodeVersions = [RECOMMENDED_NODE_VERSION, '20', '22'],
86+
nodeVersions = [RECOMMENDED_NODE_VERSION, ...SUPPORTED_NODE_VERSIONS],
8287
} = options;
8388
const javaVersion = randomReproducibleValue(`java-${key}`, javaVersions, { useVersionPlaceholders });
8489
const nodeVersion = randomReproducibleValue(`node-${key}`, nodeVersions, { useVersionPlaceholders });

0 commit comments

Comments
 (0)