From f1c27bd3f27ee4233141fa2a85c2fce26914bc41 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Tue, 10 Jun 2025 16:04:07 +0200 Subject: [PATCH 1/3] Add JAVA_26 to JRE enum Add `JRE.JAVA_26` constant and introduce JDK 26-ea CI build Closes #4642 --- .github/workflows/cross-version.yml | 2 ++ .../src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc | 1 + gradle/base/code-generator-model/src/main/resources/jre.yaml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml index 6368bf02d4a7..dd768a9c745e 100644 --- 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 index 5cf7d8a9560f..940d555585fa 100644 --- 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 index 1747ffa12dd6..25a49b994c8a 100644 --- 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.0' From 3a881ec02346a42369f856f0bb30d485b50b54a7 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Tue, 10 Jun 2025 16:34:51 +0200 Subject: [PATCH 2/3] Update JRE ranges check to expect Java 26 --- .../api/condition/EnabledForJreRangeConditionTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index 3b7afb076d8a..c05af5d4d71d 100644 --- 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()); } /** From 9eb8228dcf583d2d320dc411b8ccb4052a5676f1 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Tue, 10 Jun 2025 16:50:44 +0200 Subject: [PATCH 3/3] Update gradle/base/code-generator-model/src/main/resources/jre.yaml --- gradle/base/code-generator-model/src/main/resources/jre.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml index 25a49b994c8a..90654b64919d 100644 --- a/gradle/base/code-generator-model/src/main/resources/jre.yaml +++ b/gradle/base/code-generator-model/src/main/resources/jre.yaml @@ -31,4 +31,4 @@ - version: 25 since: '5.11.4' - version: 26 - since: '6.0.0' + since: '6.0'