Skip to content

Commit fb118dc

Browse files
authored
Add JDK 27 support
Add JDK 27-ea to cross-version test matrix, add JDK 27 to Jupiter's `JRE` enum, and mute Maven warnings. --------- Signed-off-by: Christian Stein <sormuras@gmail.com>
1 parent b06e052 commit fb118dc

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.github/workflows/cross-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
type: ga
3232
- version: 26
3333
type: ea
34+
- version: 27
35+
type: ea
3436
- version: 26
3537
type: ea
3638
release: leyden

documentation/src/docs/asciidoc/release-notes/release-notes-6.1.0-M2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ repository on GitHub.
4545
[[release-notes-6.1.0-M2-junit-jupiter-new-features-and-improvements]]
4646
==== New Features and Improvements
4747

48-
*
48+
* `JAVA_27` has been added to the `JRE` enum for use with `JRE`-based execution conditions.
4949

5050

5151
[[release-notes-6.1.0-M2-junit-vintage]]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@
3232
since: '5.11.4'
3333
- version: 26
3434
since: '5.13.2'
35+
- version: 27
36+
since: '6.1.0'

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava24;
2121
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava25;
2222
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava26;
23+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava27;
2324
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
2425
import static org.junit.platform.commons.test.PreconditionAssertions.assertPreconditionViolationFor;
2526

@@ -195,8 +196,8 @@ void minVersionGreaterThanMax() {
195196
@Test
196197
void min20() {
197198
evaluateCondition();
198-
assertEnabledOnCurrentJreIf(
199-
onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
199+
assertEnabledOnCurrentJreIf(onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25()
200+
|| onJava26() || onJava27());
200201
}
201202

202203
/**
@@ -304,7 +305,8 @@ void minVersion20MaxVersion21() {
304305
@Test
305306
void minVersion21MaxVersionMaxInteger() {
306307
evaluateCondition();
307-
assertEnabledOnCurrentJreIf(onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
308+
assertEnabledOnCurrentJreIf(
309+
onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26() || onJava27());
308310
}
309311

310312
/**

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenEnvVars.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@ static Map<String, String> forJre(JRE jre) {
3030
var list = new ArrayList<String>();
3131
if (jre.compareTo(JRE.JAVA_24) >= 0)
3232
list.addAll(FOR_JDK24_AND_LATER);
33-
if (jre.compareTo(JRE.JAVA_26) >= 0) {
33+
if (jre == JRE.JAVA_26) {
3434
// exclude "leyden" and "valhalla" builds
3535
if (Runtime.version().build().orElse(0) >= 25) {
3636
list.addAll(FOR_JDK26_AND_LATER);
3737
}
3838
}
39+
if (jre.compareTo(JRE.JAVA_27) >= 0) {
40+
list.addAll(FOR_JDK26_AND_LATER);
41+
}
3942
return list.isEmpty() ? Map.of() : Map.of("MAVEN_OPTS", String.join(" ", list));
4043
}
4144

0 commit comments

Comments
 (0)