Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generators/generator-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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';
Expand Down
9 changes: 7 additions & 2 deletions lib/testing/github-matrix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 });
Expand Down
Loading