Merge branch 'main' into marc/2982-global-read-lock-level-override

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc

@@ -45,6 +45,8 @@ repository on GitHub.
   to avoid conflicts with other control characters.
 * Fix `IllegalAccessError` thrown when using the Kotlin-specific `assertDoesNotThrow`
   assertion.
+* Stop reporting discovery issues for synthetic methods, particularly in conjunction with
+  Kotlin suspend functions.
 
 [[release-notes-6.0.1-junit-jupiter-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes

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

@@ -28,6 +28,9 @@ repository on GitHub.
 
 * Support for creating a `ModuleSelector` from a `java.lang.Module` and using
   its classloader for test discovery.
+* `OpenTestReportGeneratingListener` now supports redirecting XML events to a socket via
+  the new `junit.platform.reporting.open.xml.socket` configuration parameter. When set to a
+  port number, events are sent to `127.0.0.1:<port>` instead of being written to a file.
 * Allow implementations of `HierarchicalTestEngine` to specify which nodes require the
   global read lock by overriding the `Node.isGlobalReadLockRequired()` method to return
   `false`.

documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc

@@ -42,9 +42,15 @@ The listener is auto-registered and can be configured via the following
   Enable/disable writing the report; defaults to `false`.
 `junit.platform.reporting.open.xml.git.enabled=true|false`::
   Enable/disable including information about the Git repository (see https://github.com/ota4j-team/open-test-reporting#git[Git extension schema] of open-test-reporting); defaults to `false`.
+`junit.platform.reporting.open.xml.socket=<port>`::
+  Optional port number to redirect events to a socket instead of a file. When specified, the
+  listener will connect to `127.0.0.1:<port>` and send the XML events to the socket. The socket
+  connection is automatically closed when the test execution completes.
 
 If enabled, the listener creates an XML report file named `open-test-report.xml` in the
-configured <<junit-platform-reporting-output-directory, output directory>>.
+configured <<junit-platform-reporting-output-directory, output directory>>, unless the
+`junit.platform.reporting.open.xml.socket` configuration parameter is set, in which case the
+events are sent to the specified socket instead.
 
 If <<running-tests-capturing-output, output capturing>> is enabled, the captured output
 written to `System.out` and `System.err` will be included in the report as well.

documentation/src/docs/asciidoc/user-guide/running-tests.adoc

@@ -748,10 +748,12 @@ include::{consoleLauncherDiscoverOptionsFile}[]
 ===== Executing tests
 
 .Exit Code
-NOTE: The `{ConsoleLauncher}` exits with a status code of `1` if any containers or tests
-failed. If no tests are discovered and the `--fail-if-no-tests` command-line option is
-supplied, the `ConsoleLauncher` exits with a status code of `2`. Otherwise, the exit code
-is `0`.
+NOTE: On successful runs, the `{ConsoleLauncher}` exits with a status code of `0`.
+All non-zero codes indicate an error of some sort. For example, status code `1`
+is returned if any containers or tests failed. If no tests are discovered and the
+`--fail-if-no-tests` command-line option is supplied, the `ConsoleLauncher` exits
+with a status code of `2`. Unexpected or invalid user input yields a status code
+of `3`. An exit code of `-1` indicates an unspecified error condition.
 
 ----
 include::{consoleLauncherExecuteOptionsFile}[]

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 ant = "1.10.15"
 apiguardian = "1.1.2"
-asciidoctorj-pdf = "2.3.21"
+asciidoctorj-pdf = "2.3.23"
 asciidoctor-plugins = "4.0.5" # Check if workaround in documentation.gradle.kts can be removed when upgrading
 assertj = "3.27.6"
 bnd = "7.1.0"
@@ -32,14 +32,16 @@ bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.184" }
 commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
-error-prone-contrib = { module = "tech.picnic.error-prone-support:error-prone-contrib", version = "0.25.0" }
+error-prone-contrib = { module = "tech.picnic.error-prone-support:error-prone-contrib", version = "0.26.0" }
 error-prone-core = { module = "com.google.errorprone:error_prone_core", version = "2.43.0" }
 fastcsv = { module = "de.siegmar:fastcsv", version = "4.1.0" }
 groovy = { module = "org.apache.groovy:groovy", version = "5.0.2" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "3.0" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jaxb-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version = "4.0.4" }
+jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version = "4.0.6" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.1" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
@@ -72,6 +74,7 @@ snapshotTests-xml = { module = "de.skuzzle.test:snapshot-tests-xml", version.ref
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
+xmlunit-jakarta-jaxb-impl = { module = "org.xmlunit:xmlunit-jakarta-jaxb-impl", version.ref = "xmlunit" }
 testingAnnotations = { module = "com.gradle:develocity-testing-annotations", version = "2.0.1" }
 woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version = "7.1.1" }
 
@@ -87,7 +90,7 @@ ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint
 [bundles]
 ant = ["ant", "ant-junit", "ant-junitlauncher"]
 log4j = ["log4j-core", "log4j-jul"]
-xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
+xmlunit = ["xmlunit-assertj", "xmlunit-placeholders", "xmlunit-jakarta-jaxb-impl", "jaxb-api", "jaxb-runtime"]
 
 [plugins]
 asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-plugins" }

gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-nohttp.gradle.kts

@@ -15,9 +15,9 @@ dependencies {
 		}
 		checkstyle("ch.qos.logback:logback-classic") {
 			version {
-				require("1.5.18")
+				require("1.5.19")
 			}
-			because("Workaround for CVE-2024-12798 and CVE-2024-12801")
+			because("Workaround for CVE-2025-11226")
 		}
 	}
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java

@@ -45,6 +45,16 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
+ * <h2>{@code ExtensionContext} Scope</h2>
+ *
+ * <p>As of JUnit Jupiter 5.12, this API participates in the
+ * {@link TestInstantiationAwareExtension} contract. Implementations of this API
+ * may therefore choose to override
+ * {@link TestInstantiationAwareExtension#getTestInstantiationExtensionContextScope(ExtensionContext)
+ * getTestInstantiationExtensionContextScope(ExtensionContext)}. See
+ * {@link #interceptTestClassConstructor(Invocation, ReflectiveInvocationContext, ExtensionContext)}
+ * for details.
+ *
  * @since 5.5
  * @see Invocation
  * @see ReflectiveInvocationContext

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java

@@ -48,6 +48,15 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
+ * <h2>{@code ExtensionContext} Scope</h2>
+ *
+ * <p>As of JUnit Jupiter 5.12, this API participates in the
+ * {@link TestInstantiationAwareExtension} contract. Implementations of this API
+ * may therefore choose to override
+ * {@link TestInstantiationAwareExtension#getTestInstantiationExtensionContextScope(ExtensionContext)
+ * getTestInstantiationExtensionContextScope(ExtensionContext)} to require a
+ * test-method scoped {@code ExtensionContext}.
+ *
  * @since 5.0
  * @see #supportsParameter(ParameterContext, ExtensionContext)
  * @see #resolveParameter(ParameterContext, ExtensionContext)

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java

@@ -43,6 +43,17 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
+ * <h2>{@code ExtensionContext} Scope</h2>
+ *
+ * <p>As of JUnit Jupiter 5.12, this API participates in the
+ * {@link TestInstantiationAwareExtension} contract. Implementations of this API
+ * may therefore choose to override
+ * {@link TestInstantiationAwareExtension#getTestInstantiationExtensionContextScope(ExtensionContext)
+ * getTestInstantiationExtensionContextScope(ExtensionContext)} to require a
+ * test-method scoped {@code ExtensionContext}. See
+ * {@link #createTestInstance(TestInstanceFactoryContext, ExtensionContext)} for
+ * further details.
+ *
  * @since 5.3
  * @see #createTestInstance(TestInstanceFactoryContext, ExtensionContext)
  * @see TestInstanceFactoryContext

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java

@@ -33,6 +33,16 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
+ * <h2>{@code ExtensionContext} Scope</h2>
+ *
+ * <p>As of JUnit Jupiter 5.12, this API participates in the
+ * {@link TestInstantiationAwareExtension} contract. Implementations of this API
+ * may therefore choose to override
+ * {@link TestInstantiationAwareExtension#getTestInstantiationExtensionContextScope(ExtensionContext)
+ * getTestInstantiationExtensionContextScope(ExtensionContext)} to require a
+ * test-method scoped {@code ExtensionContext}. See
+ * {@link #postProcessTestInstance(Object, ExtensionContext)} for further details.
+ *
  * @since 5.0
  * @see #postProcessTestInstance(Object, ExtensionContext)
  * @see TestInstancePreDestroyCallback