HV-2145 Require JDK 25 for the build

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

.github/workflows/ci.yml

@@ -63,20 +63,20 @@ jobs:
       matrix:
         os:
           - {
-            name: "Linux JDK 21",
+            name: "Linux JDK 25",
             runs-on: 'ubuntu-latest',
             java: {
-              version: 21
+              version: 25
             },
             maven: {
               args: ''
             }
           }
           - {
-            name: "Windows JDK 21",
+            name: "Windows JDK 25",
             runs-on: 'windows-latest',
             java: {
-              version: 21
+              version: 25
             },
             maven: {
               args: ''

CONTRIBUTING.md

@@ -49,7 +49,7 @@ Just fork this repository, build your test case and attach it as an archive to a
 
 ### <a id="setup-build-tools"></a> Build tools
 
-You will need JDK 21 or above for the build.
+You will need JDK 25 or above for the build.
 
 A maven wrapper script is provided at the root of the repository (`./mvnw`),
 so you can use that and don't need to care about the required version of Maven
@@ -97,7 +97,7 @@ If you already did that, close IntelliJ IDEA, run `./mvnw clean`, and open Intel
 You will need to change some settings:
 
 * `Build, Execution, Deployment > Build Tools > Maven`: set `Maven home path` to `Use Maven wrapper`
-* In `Project structure`, make sure the project JDK is JDK 21.
+* In `Project structure`, make sure the project JDK is JDK 25.
 * Set up [formatting rules and code style](#setup-ide-formatting).
 
 Then a few steps will initialize your workspace:
@@ -349,19 +349,19 @@ than [the one required for the build](#setup-build-tools),
 you will need to have both JDKs installed,
 and then you will need to pass additional properties to Maven.
 
-To test Hibernate Validator against the JDK 17:
+To test Hibernate Validator against the JDK 25:
 
 ```bash
 ./mvnw clean install
 ```
 
-To test Hibernate Validator against JDKs other than 17:
+To test Hibernate Validator against JDKs other than 25:
 
 ```bash
 ./mvnw clean install -Djava-version.test.release=21 -Djava-version.test.compiler.java_home=/path/to/jdk21
 ```
 
-Or more simply, if the JDK you want to test against is newer than 21 and is your default JDK:
+Or more simply, if the JDK you want to test against is newer than 25 and is your default JDK:
 
 ```bash
 ./mvnw clean install -Djava-version.test.release=18

Jenkinsfile

@@ -75,7 +75,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
  *
  */
 
-@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 21 Latest'
+@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 25 Latest'
 @Field final String MAVEN_TOOL = 'Apache Maven 3.9'
 
 // Default node pattern, to be used for resource-intensive stages.
@@ -115,31 +115,25 @@ stage('Configure') {
 					new JdkBuildEnvironment(testJavaVersion: '17', testCompilerTool: 'OpenJDK 17 Latest',
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
-							condition: TestCondition.BEFORE_MERGE,
-							isDefault: true),
+							condition: TestCondition.AFTER_MERGE),
 
 					// 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 JdkBuildEnvironment(testJavaVersion: '23', testCompilerTool: 'OpenJDK 23 Latest',
-							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE),
-					new JdkBuildEnvironment(testJavaVersion: '24', testCompilerTool: 'OpenJDK 24 Latest',
-							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(testJavaVersion: '25', testCompilerTool: 'OpenJDK 25 Latest',
 							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE),
+							condition: TestCondition.BEFORE_MERGE,
+							isDefault: true),
 					new JdkBuildEnvironment(testJavaVersion: '26', testCompilerTool: 'OpenJDK 26 Latest',
 							testLauncherArgs: '--enable-preview',
 							condition: TestCondition.AFTER_MERGE)
 			],
 			wildflyTck: [
-					new WildFlyTckBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
+					new WildFlyTckBuildEnvironment(testJavaVersion: '25', testCompilerTool: 'OpenJDK 25 Latest',
 							condition: TestCondition.ON_DEMAND)
 			],
 			sigtest: [
-					new SigTestBuildEnvironment(testJavaVersion: '21', jdkTool: 'OpenJDK 21 Latest',
+					new SigTestBuildEnvironment(testJavaVersion: '25', jdkTool: 'OpenJDK 25 Latest',
 							condition: TestCondition.BEFORE_MERGE)
 			]
 	])

jenkins/nightly/Jenkinsfile

@@ -6,7 +6,7 @@
 @Library('hibernate-jenkins-pipeline-helpers') _
 
 def withMavenWorkspace(Closure body) {
-	withMavenWorkspace('OpenJDK 21 Latest', body)
+	withMavenWorkspace('OpenJDK 25 Latest', body)
 }
 
 def withMavenWorkspace(jdk, Closure body) {

jenkins/release/Jenkinsfile

@@ -13,7 +13,7 @@ pipeline {
 	}
 	tools {
 		maven 'Apache Maven 3.9'
-		jdk 'OpenJDK 21 Latest'
+		jdk 'OpenJDK 25 Latest'
 	}
 	options {
 		buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')

jenkins/snapshot-publish/Jenkinsfile

@@ -18,7 +18,7 @@ pipeline {
 	}
 	tools {
 		maven 'Apache Maven 3.9'
-		jdk 'OpenJDK 21 Latest'
+		jdk 'OpenJDK 25 Latest'
 	}
 	options {
 		// Wait for 1h before publishing snapshots, in case there's more commits.

pom.xml

@@ -405,7 +405,7 @@
 
         <!-- JDK version required for the build -->
         <!-- Remember to update README/CONTRIBUTING when changing the version here. -->
-        <jdk.min.version>21</jdk.min.version>
+        <jdk.min.version>25</jdk.min.version>
         <!-- Maven version required for the build -->
         <!--
             When changing the version here, remember to: