Add JAVA_26 to JRE enum

sormuras · web-flow · commit 00d380bfce09 · 2025-06-17T11:58:26.000+02:00
Add `JRE.JAVA_26` constant and introduce JDK 26-ea CI build Closes #4642
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
@@ -24,6 +24,8 @@ jobs:
         jdk:
         - version: 25
           type: ea
+        - version: 26
+          type: ea
     name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
     runs-on: ubuntu-latest
     steps:
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc
@@ -129,6 +129,7 @@ repository on GitHub.
 * Kotlin's `suspend` modifier may now be applied to test and lifecycle methods.
 * The `Arguments` interface for parameterized tests is now officially a
   `@FunctionalInterface`.
+* `JAVA_26` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-6.0.0-M1-junit-vintage]]
diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml
@@ -30,3 +30,5 @@
   since: '5.11'
 - version: 25
   since: '5.11.4'
+- version: 26
+  since: '6.0'
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava23;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava24;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava25;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava26;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Test;
@@ -201,7 +202,8 @@ void minVersionGreaterThanMax() {
 	@Test
 	void min20() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25());
+		assertEnabledOnCurrentJreIf(
+			onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
 	}
 
 	/**
@@ -310,7 +312,7 @@ void minVersion20MaxVersion21() {
 	void minVersion21MaxVersionMaxInteger() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()
-				|| onJava23() || onJava24() || onJava25());
+				|| onJava23() || onJava24() || onJava25() || onJava26());
 	}
 
 	/**
