Require JDK 21 for building (but keep the Java 17 baseline)

Author: yrodiere

.github/workflows/ci-report.yml

@@ -21,11 +21,11 @@ jobs:
         with:
           persist-credentials: false
           ref: ${{ github.ref }}
-      - name: Set up Java 17
+      - name: Set up JDK
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Generate cache key
         id: cache-key

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: OpenJDK 17 - ${{matrix.rdbms}}
+    name: OpenJDK 21 - ${{matrix.rdbms}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -55,11 +55,11 @@ jobs:
         env:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Generate cache key
         id: cache-key
@@ -253,11 +253,11 @@ jobs:
           persist-credentials: false
       - name: Reclaim disk space and sanitize user home
         run: .github/ci-prerequisites-atlas.sh
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Generate cache key
         id: cache-key

.github/workflows/codeql.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

Jenkinsfile

@@ -14,7 +14,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
 @Library('hibernate-jenkins-pipeline-helpers') _
 import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
 
-@Field final String DEFAULT_JDK_VERSION = '17'
+@Field final String DEFAULT_JDK_VERSION = '21'
 @Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
 @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
 @Field List<BuildEnvironment> environments
@@ -40,10 +40,11 @@ stage('Configure') {
 // Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
 // 		new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
 		new BuildEnvironment( node: 's390x' ),
+		// We build with JDK 21, but produce Java 17 bytecode, so we test with JDK 17, to be sure everything works.
+		new BuildEnvironment( testJdkVersion: '17' ),
 		// We want to enable preview features when testing newer builds of OpenJDK:
 		// even if we don't use these features, just enabling them can cause side effects
 		// and it's useful to test that.
-		new BuildEnvironment( testJdkVersion: '21', testJdkLauncherArgs: '--enable-preview' ),
 		new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview' ),
 		new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview' ),
 		// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:

README.adoc

@@ -21,7 +21,7 @@ for its CI needs. See
 
 == Building from sources
 
-The build requires at least Java 11 and at most Java 17.
+The build requires at least JDK 21, and produces Java 17 bytecode.
 
 Hibernate uses https://gradle.org[Gradle] as its build tool. See the _Gradle Primer_ section below if you are new to
 Gradle.

ci/jpa-3.2-tck.Jenkinsfile

@@ -22,7 +22,7 @@ else {
 pipeline {
     agent none
     tools {
-        jdk 'OpenJDK 17 Latest'
+        jdk 'OpenJDK 21 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])

ci/release/Jenkinsfile

@@ -70,7 +70,7 @@ pipeline {
 		cron('0 0 * * 0')
 	}
 	tools {
-		jdk 'OpenJDK 17 Latest'
+		jdk 'OpenJDK 21 Latest'
 	}
 	options {
 		buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')

ci/snapshot-publish.Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
         label 'Release'
     }
     tools {
-        jdk 'OpenJDK 17 Latest'
+        jdk 'OpenJDK 21 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])

gradle.properties

@@ -27,4 +27,5 @@ org.gradle.java.installations.auto-download=false
 
 # externalized definition of JDK versions so that they are available in both Project (build.gradle) and Settings (settings.gradle)
 orm.jdk.base=17
+orm.jdk.min=21
 orm.jdk.max=24

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java

@@ -8,6 +8,7 @@
 import java.util.Set;
 
 import org.gradle.StartParameter;
+import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.initialization.Settings;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
@@ -32,13 +33,15 @@ public class JdkVersionConfig {
 
 	private final boolean explicit;
 	private final JavaLanguageVersion baseline;
+	private final JavaLanguageVersion min;
 	private final JavaLanguageVersion max;
 	private final MainJdks main;
 	private final TestJdks test;
 
 	public JdkVersionConfig(
 			boolean explicit,
 			JavaLanguageVersion baseline,
+			JavaLanguageVersion min,
 			JavaLanguageVersion max,
 			JavaLanguageVersion mainCompilerVersion,
 			JavaLanguageVersion mainReleaseVersion,
@@ -47,6 +50,7 @@ public JdkVersionConfig(
 			JavaLanguageVersion testLauncherVersion) {
 		this.explicit = explicit;
 		this.baseline = baseline;
+		this.min = min;
 		this.max = max;
 		this.main = new MainJdks( mainCompilerVersion, mainReleaseVersion );
 		this.test = new TestJdks( testCompileVersion, testReleaseVersion, testLauncherVersion );
@@ -72,6 +76,18 @@ public JavaLanguageVersion getBaselineVersion() {
 		return getBaseline();
 	}
 
+	public JavaLanguageVersion getMin() {
+		return min;
+	}
+
+	public String getMinStr() {
+		return getMin().toString();
+	}
+
+	public JavaLanguageVersion getMinVersion() {
+		return getMin();
+	}
+
 	public JavaLanguageVersion getMax() {
 		return max;
 	}
@@ -128,36 +144,36 @@ public static JdkVersionConfig createVersionConfig(
 			JavaLanguageVersion explicitTestVersion,
 			JavaLanguageVersion gradleJdkVersion,
 			JavaLanguageVersion baselineJdkVersion,
+			JavaLanguageVersion minSupportedJdkVersion,
 			JavaLanguageVersion maxSupportedJdkVersion) {
 		final boolean explicitlyConfigured = explicitMainVersion != null || explicitTestVersion != null;
 
 		final JavaLanguageVersion mainCompilerVersion;
 		final JavaLanguageVersion mainReleaseVersion;
 		final JavaLanguageVersion testCompilerVersion;
-		final JavaLanguageVersion testReleaseVersion;
+		JavaLanguageVersion testReleaseVersion;
 		final JavaLanguageVersion testLauncherVersion;
 
 		if ( explicitlyConfigured ) {
-			mainCompilerVersion = requireNonNullElse( explicitMainVersion, baselineJdkVersion );
-			testCompilerVersion = requireNonNullElse( explicitTestVersion, baselineJdkVersion );
+			mainCompilerVersion = requireNonNullElse( explicitMainVersion, minSupportedJdkVersion );
+			testCompilerVersion = requireNonNullElse( explicitTestVersion, minSupportedJdkVersion );
 			mainReleaseVersion = baselineJdkVersion;
 
-			if ( testCompilerVersion.asInt() > maxSupportedJdkVersion.asInt() ) {
+			testReleaseVersion = requireNonNullElse( explicitTestVersion, mainReleaseVersion );
+			if ( testReleaseVersion.asInt() > maxSupportedJdkVersion.asInt() ) {
 				System.out.println(
-						"[WARN] Gradle does not support bytecode version '" + testCompilerVersion + "'."
+						"[WARN] Gradle does not support bytecode version '" + testReleaseVersion + "'."
 								+ " Forcing test bytecode to version " + maxSupportedJdkVersion + "."
 				);
 				testReleaseVersion = maxSupportedJdkVersion;
 			}
-			else {
-				testReleaseVersion = testCompilerVersion;
-			}
 
-			testLauncherVersion = testCompilerVersion;
+			testLauncherVersion = testReleaseVersion;
 
 			return new JdkVersionConfig(
 					true,
 					baselineJdkVersion,
+					minSupportedJdkVersion,
 					maxSupportedJdkVersion,
 					mainCompilerVersion,
 					mainReleaseVersion,
@@ -170,6 +186,11 @@ public static JdkVersionConfig createVersionConfig(
 			// Not testing a particular JDK version: we will use the same JDK used to run Gradle.
 			// We disable toolchains for convenience, so that anyone can just run the build with their own JDK
 			// without any additional options and without downloading the whole JDK.
+
+			if ( gradleJdkVersion.asInt() > minSupportedJdkVersion.asInt() ) {
+				throw new GradleException("This build requires at least JDK " + minSupportedJdkVersion + ", but you are using JDK " + gradleJdkVersion.asInt());
+			}
+
 			if ( gradleJdkVersion.asInt() > maxSupportedJdkVersion.asInt() ) {
 				System.out.println(
 						"[WARN] Gradle does not support this JDK, because it is too recent; build is likely to fail."
@@ -184,6 +205,7 @@ public static JdkVersionConfig createVersionConfig(
 			return new JdkVersionConfig(
 					false,
 					baselineJdkVersion,
+					minSupportedJdkVersion,
 					maxSupportedJdkVersion,
 					gradleJdkVersion,
 					baselineJdkVersion,

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionPlugin.java

@@ -49,13 +49,15 @@ public void apply(Project project) {
 		final VersionCatalogsExtension versionCatalogs = project.getExtensions().getByType( VersionCatalogsExtension.class );
 		final VersionCatalog jdkVersions = versionCatalogs.named( "jdks" );
 		final JavaLanguageVersion baselineJdkVersion = getJavaLanguageVersion( jdkVersions, "baseline" );
+		final JavaLanguageVersion minSupportedJdkVersion = getJavaLanguageVersion( jdkVersions, "minSupportedJdk" );
 		final JavaLanguageVersion maxSupportedJdkVersion = getJavaLanguageVersion( jdkVersions, "maxSupportedBytecode" );
 
 		final JdkVersionConfig jdkVersionConfig = createVersionConfig(
 				explicitMainVersion,
 				explicitTestVersion,
 				gradleJdkVersion,
 				baselineJdkVersion,
+				minSupportedJdkVersion,
 				maxSupportedJdkVersion
 		);
 

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java

@@ -36,13 +36,15 @@ public void apply(Settings settings) {
 
 		final JavaLanguageVersion gradleJdkVersion = JavaLanguageVersion.of( JavaVersion.current().getMajorVersion() );
 		final JavaLanguageVersion baselineJdkVersion = getJavaLanguageVersion( settings, "orm.jdk.base" );
+		final JavaLanguageVersion minSupportedJdkVersion = getJavaLanguageVersion( settings, "orm.jdk.min" );
 		final JavaLanguageVersion maxSupportedJdkVersion = getJavaLanguageVersion( settings, "orm.jdk.max" );
 
 		final JdkVersionConfig jdkVersionConfig = createVersionConfig(
 				explicitMainVersion,
 				explicitTestVersion,
 				gradleJdkVersion,
 				baselineJdkVersion,
+				minSupportedJdkVersion,
 				maxSupportedJdkVersion
 		);
 

nightly.Jenkinsfile

@@ -14,7 +14,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
 @Library('hibernate-jenkins-pipeline-helpers') _
 import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
 
-@Field final String DEFAULT_JDK_VERSION = '17'
+@Field final String DEFAULT_JDK_VERSION = '21'
 @Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
 @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
 @Field List<BuildEnvironment> environments

settings.gradle

@@ -59,12 +59,15 @@ dependencyResolutionManagement {
         jdks {
             // see gradle.properties (or set with -D/-P)
             var String baseJdk = jdkVersions.baseline
+            var String minJdk = jdkVersions.min
             var String maxJdk = jdkVersions.max
 
             version "baseline", baseJdk
             version "compatible", "17 or 21"
             version "jdbc", "4.2" // Bundled with JDK 11
 
+            // We may require a minimum JDK version, for consistency across builds
+            version "minSupportedJdk", minJdk
             // Gradle does bytecode transformation on tests.
             // You can't use bytecode higher than what Gradle supports, even with toolchains.
             version "maxSupportedBytecode", maxJdk