Skip to content

Add JAVA_26 to JRE enum #4643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 17, 2025
+9 −2
Merged

Add JAVA_26 to JRE enum #4643

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c27bd
Add JAVA_26 to JRE enum
sormuras Jun 10, 2025
3a881ec
Update JRE ranges check to expect Java 26
sormuras Jun 10, 2025
9eb8228
Update gradle/base/code-generator-model/src/main/resources/jre.yaml
sormuras Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/cross-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
2 changes: 2 additions & 0 deletions gradle/base/code-generator-model/src/main/resources/jre.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
since: '5.11'
- version: 25
since: '5.11.4'
- version: 26
since: '6.0.0'
6 changes: 4 additions & 2 deletions ...tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -310,7 +312,7 @@ void minVersion20MaxVersion21() {
void minVersion21MaxVersionMaxInteger() {
evaluateCondition();
assertEnabledOnCurrentJreIf(onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()
|| onJava23() || onJava24() || onJava25());
|| onJava23() || onJava24() || onJava25() || onJava26());
}

/**
Expand Down