Merge branch 'main' into marc/private-vulnerability-reporting

Author: marcphilipp

.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:

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]]

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'

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ ktlint = "1.6.0"
 log4j = "2.24.3"
 logback = "1.5.18"
 opentest4j = "1.3.0"
-openTestReporting = "0.3.0-SNAPSHOT"
+openTestReporting = "0.2.4"
 snapshotTests = "1.11.0"
 surefire = "3.5.3"
 xmlunit = "2.10.2"

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());
 	}
 
 	/**

platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts

@@ -28,12 +28,6 @@ dependencyResolutionManagement {
 					snapshotsOnly()
 				}
 			}
-			maven(url = "https://central.sonatype.com/repository/maven-snapshots/") {
-				mavenContent {
-					snapshotsOnly()
-					includeGroup("org.opentest4j.reporting")
-				}
-			}
 		}
 	}
 }

platform-tooling-support-tests/projects/jupiter-starter/build.gradle.kts

@@ -7,12 +7,6 @@ val junitVersion: String by project
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
-	maven(url = "https://central.sonatype.com/repository/maven-snapshots/") {
-		mavenContent {
-			snapshotsOnly()
-			includeGroup("org.opentest4j.reporting")
-		}
-	}
 }
 
 dependencies {

settings.gradle.kts

@@ -15,12 +15,6 @@ plugins {
 dependencyResolutionManagement {
 	repositories {
 		mavenCentral()
-		maven(url = "https://central.sonatype.com/repository/maven-snapshots") {
-			mavenContent {
-				snapshotsOnly()
-				includeGroup("org.opentest4j.reporting")
-			}
-		}
 	}
 }