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

marko-bekhta · marko-bekhta · commit c43daa0b7c4b · 2025-10-08T20:46:51.000+02:00
diff --git a/.github/workflows/ci-report.yml b/.github/workflows/ci-report.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Generate cache key
         id: cache-key
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: OpenJDK 21 - ${{matrix.rdbms}}
+    name: OpenJDK 25 - ${{matrix.rdbms}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -63,11 +63,11 @@ jobs:
         env:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
-      - name: Set up Java 21
+      - name: Set up Java 25
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Generate cache key
         id: cache-key
@@ -147,7 +147,7 @@ jobs:
   otp:
     permissions:
       contents: read
-    name: GraalVM 21 - ${{matrix.rdbms}}
+    name: GraalVM 25 - ${{matrix.rdbms}}
     runs-on: [ self-hosted, Linux, X64, OracleTestPilot ]
     strategy:
       fail-fast: false
@@ -161,11 +161,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - name: Set up Java 21
+      - name: Set up Java 25
         uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8
         with:
           distribution: 'graalvm'
-          java-version: '21'
+          java-version: '25'
       - name: Generate cache key
         id: cache-key
         run: |
@@ -270,11 +270,11 @@ jobs:
           persist-credentials: false
       - name: Reclaim disk space and sanitize user home
         run: .github/ci-prerequisites-atlas.sh
-      - name: Set up Java 21
+      - name: Set up Java 25
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Generate cache key
         id: cache-key
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/Jenkinsfile b/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 = '21'
+@Field final String DEFAULT_JDK_VERSION = '25'
 @Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
 @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
 @Field List<BuildEnvironment> environments
@@ -40,14 +40,15 @@ 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 generally build with JDK 21, but our baseline is Java 17, so we test with JDK 17, to be sure everything works.
+		// We generally build with JDK 25, but our baseline is Java 17, so we test with JDK 17, to be sure everything works.
 		// Here we even compile the main code with JDK 17, to be sure no JDK 18+ classes are depended on.
-		new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
+        new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
+        new BuildEnvironment( mainJdkVersion: '21', testJdkVersion: '21' ),
+        new BuildEnvironment( mainJdkVersion: '25', testJdkVersion: '25' ),
 		// 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: '24', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
-		new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
+
 		// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:
 		// they require the use of -Dnet.bytebuddy.experimental=true.
 		// Make sure to remove that argument as soon as possible
diff --git a/README.adoc b/README.adoc
@@ -18,7 +18,7 @@ See link:MAINTAINERS.md#ci[MAINTAINERS.md] for information about CI.
 
 == Building from sources
 
-The build requires at least JDK 21, and produces Java 17 bytecode.
+The build requires at least JDK 25, 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.
diff --git a/ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.2-tck.Jenkinsfile
@@ -22,15 +22,15 @@ else {
 pipeline {
     agent none
     tools {
-        jdk 'OpenJDK 21 Latest'
+        jdk 'OpenJDK 25 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])
         buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
         disableConcurrentBuilds(abortPrevious: true)
     }
     parameters {
-        choice(name: 'IMAGE_JDK', choices: ['jdk17', 'jdk21'], description: 'The JDK base image version to use for the TCK image.')
+        choice(name: 'IMAGE_JDK', choices: ['jdk17', 'jdk21', 'jdk25'], description: 'The JDK base image version to use for the TCK image.')
         string(name: 'TCK_VERSION', defaultValue: '3.2.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
         string(name: 'TCK_SHA', defaultValue: '', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
 		string(name: 'TCK_URL', defaultValue: 'https://www.eclipse.org/downloads/download.php?file=/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-persistence-tck-3.2.0.zip&mirror_id=1', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
@@ -70,7 +70,7 @@ pipeline {
 		cron('0 0 * * 0')
 	}
 	tools {
-		jdk 'OpenJDK 21 Latest'
+		jdk 'OpenJDK 25 Latest'
 	}
 	options {
 		buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')
diff --git a/ci/snapshot-publish.Jenkinsfile b/ci/snapshot-publish.Jenkinsfile
@@ -23,7 +23,7 @@ pipeline {
         label 'Release'
     }
     tools {
-        jdk 'OpenJDK 21 Latest'
+        jdk 'OpenJDK 25 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
@@ -216,8 +216,8 @@ def aggregateJavadocsTask = tasks.register( "javadoc", Javadoc ) {
 				? javadocTool.get().metadata.languageVersion
 				: JavaLanguageVersion.of( JavaVersion.current().name )
 
-		if ( javaLanguageVersion.asInt() != 21 ) {
-			println "Aggregated Javadocs are bing built` using a JDK different than version 21: \n" +
+		if ( javaLanguageVersion.asInt() != jdkVersions.min.asInt() ) {
+			println "Aggregated Javadocs are bing built` using a JDK different than version ${jdkVersions.min.asInt()}: \n" +
 					"\t* `stylesheet.css` might not be compatible\n" +
 					"\t* generating the User Guide settings fragment might not succeed"
 		}
diff --git a/gradle.properties b/gradle.properties
@@ -27,9 +27,9 @@ 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=23
+orm.jdk.min=25
 # See gradlew/wrapper/gradle-wrapper.properties, https://docs.gradle.org/current/userguide/compatibility.html#java_runtime
-orm.jdk.max=24
+orm.jdk.max=25
 
 # The minimum version of Gradle supported for the ORM Gradle plugin.
 # This is the version used in the plugin tests, used to make sure we do not break compatibility.
diff --git a/local-build-plugins/build.gradle b/local-build-plugins/build.gradle
@@ -43,8 +43,8 @@ dependencies {
 
 tasks.compileJava {
 	options.encoding = 'UTF-8'
-	sourceCompatibility = 11
-	targetCompatibility = 11
+	sourceCompatibility = 17
+	targetCompatibility = 17
 }
 
 gradlePlugin {
diff --git a/nightly.Jenkinsfile b/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 = '21'
+@Field final String DEFAULT_JDK_VERSION = '25'
 @Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
 @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
 @Field List<BuildEnvironment> environments
@@ -212,7 +212,7 @@ stage('Build') {
 		executions.put('Strict JAXP configuration', {
 			runBuildOnNode(NODE_PATTERN_BASE) {
 				// we want to test with JDK 23 where the strict settings were introduced
-				def testJavaHome = tool(name: "OpenJDK 23 Latest", type: 'jdk')
+				def testJavaHome = tool(name: "OpenJDK 25 Latest", type: 'jdk')
 				def javaHome = tool(name: DEFAULT_JDK_TOOL, type: 'jdk')
 				// Use withEnv instead of setting env directly, as that is global!
 				// See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md
diff --git a/settings.gradle b/settings.gradle
@@ -63,7 +63,7 @@ dependencyResolutionManagement {
             var String maxJdk = jdkVersions.max
 
             version "baseline", baseJdk
-            version "compatible", "17 or 21"
+            version "compatible", "17, 21 or 25"
             version "jdbc", "4.2" // Bundled with JDK 11
 
             // We may require a minimum JDK version, for consistency across builds

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ pipeline {`
`70`	`70`	`cron('0 0 * * 0')`
`71`	`71`	`}`
`72`	`72`	`tools {`
`73`		`- jdk 'OpenJDK 21 Latest'`
	`73`	`+ jdk 'OpenJDK 25 Latest'`
`74`	`74`	`}`
`75`	`75`	`options {`
`76`	`76`	`buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ pipeline {`
`23`	`23`	`label 'Release'`
`24`	`24`	`}`
`25`	`25`	`tools {`
`26`		`- jdk 'OpenJDK 21 Latest'`
	`26`	`+ jdk 'OpenJDK 25 Latest'`
`27`	`27`	`}`
`28`	`28`	`options {`
`29`	`29`	`rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])`