Skip to content

Commit 6b256d6

Browse files
sormurasmarcphilipp
authored andcommitted
Add JAVA_26 to JRE enum
Add `JRE.JAVA_26` constant and introduce JDK 26-ea CI build Closes #4642 (cherry picked from commit 00d380b)
1 parent 0009e68 commit 6b256d6

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/cross-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
type: ga
2727
- version: 25
2828
type: ea
29+
- version: 26
30+
type: ea
2931
name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
3032
runs-on: ubuntu-latest
3133
steps:

gradle/base/code-generator-model/src/main/resources/jre.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@
3030
since: '5.11'
3131
- version: 25
3232
since: '5.11.4'
33+
- version: 26
34+
since: '6.0'

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava23;
2828
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava24;
2929
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava25;
30+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava26;
3031
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
3132
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
3233
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
@@ -209,7 +210,8 @@ void minVersionGreaterThanMax() {
209210
@Test
210211
void min20() {
211212
evaluateCondition();
212-
assertEnabledOnCurrentJreIf(onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25());
213+
assertEnabledOnCurrentJreIf(
214+
onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
213215
}
214216

215217
/**
@@ -320,7 +322,7 @@ void minVersion20MaxVersion21() {
320322
void minVersion17MaxVersionMaxInteger() {
321323
evaluateCondition();
322324
assertEnabledOnCurrentJreIf(onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()
323-
|| onJava23() || onJava24() || onJava25());
325+
|| onJava23() || onJava24() || onJava25() || onJava26());
324326
}
325327

326328
/**

0 commit comments

Comments
 (0)